1 files changed, 45 insertions, 39 deletions

diff --git a/new/unix/checkbox.c b/new/unix/checkbox.c
index ddf9eda..de49439 100644
--- a/new/unix/checkbox.c
+++ b/new/unix/checkbox.c
@@ -2,6 +2,7 @@
 #include "uipriv_unix.h"
 
 struct checkbox {
+	uiCheckbox c;
 	void (*onToggled)(uiControl *, void *);
 	void *onToggledData;
 	gulong onToggledSignal;
@@ -9,10 +10,9 @@ struct checkbox {
 
 static void onToggled(GtkToggleButton *b, gpointer data)
 {
-	uiControl *c = (uiControl *) data;
-	struct checkbox *cc = (struct checkbox *) (c->data);
+	struct checkbox *c = (struct checkbox *) data;
 
-	(*(cc->onToggled))(c, cc->onToggledData);
+	(*(c->onToggled))(uiControl(c), c->onToggledData);
 }
 
 static void defaultOnToggled(uiControl *c, void *data)
@@ -22,59 +22,39 @@ static void defaultOnToggled(uiControl *c, void *data)
 
 static void onDestroy(GtkWidget *widget, gpointer data)
 {
-	struct checkbox *cc = (struct checkbox *) data;
+	struct checkbox *c = (struct checkbox *) data;
 
-	uiFree(cc);
+	uiFree(c);
 }
 
-uiControl *uiNewCheckbox(const char *text)
-{
-	uiControl *c;
-	struct checkbox *cc;
-	GtkWidget *widget;
-
-	c = uiUnixNewControl(GTK_TYPE_CHECK_BUTTON,
-		FALSE, FALSE,
-		"label", text,
-		NULL);
-
-	widget = GTK_WIDGET(uiControlHandle(c));
-
-	cc = uiNew(struct checkbox);
-	g_signal_connect(widget, "destroy", G_CALLBACK(onDestroy), cc);
-	cc->onToggledSignal = g_signal_connect(widget, "toggled", G_CALLBACK(onToggled), c);
-	cc->onToggled = defaultOnToggled;
-	c->data = cc;
+#define CHECKBOX(c) GTK_CHECK_BUTTON(uiControlHandle(uiControl(c)))
 
-	return c;
-}
-
-char *uiCheckboxText(uiControl *c)
+static char *getText(uiCheckbox *c)
 {
-	return g_strdup(gtk_button_get_label(GTK_BUTTON(uiControlHandle(c))));
+	return g_strdup(gtk_button_get_label(CHECKBOX(c)));
 }
 
-void uiCheckboxSetText(uiControl *c, const char *text)
+static void setText(uiCheckbox *c, const char *text)
 {
-	gtk_button_set_label(GTK_BUTTON(uiControlHandle(c)), text);
+	gtk_button_set_label(CHECKBOX(c), text);
 }
 
-void uiCheckboxOnToggled(uiControl *c, void (*f)(uiControl *, void *), void *data)
+static void setOnToggled(uiCheckbox *c, void (*f)(uiControl *, void *), void *data)
 {
-	struct checkbox *cc = (struct checkbox *) (c->data);
+	struct checkbox *c = (struct checkbox *) c;
 
-	cc->onToggled = f;
-	cc->onToggledData = data;
+	c->onToggled = f;
+	c->onToggledData = data;
 }
 
-int uiCheckboxChecked(uiControl *c)
+static int getChecked(uiCheckbox *c)
 {
-	return gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(uiControlHandle(c))) != FALSE;
+	return gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(CHECKBOX(c))) != FALSE;
 }
 
-void uiCheckboxSetChecked(uiControl *c, int checked)
+static void setChecked(uiCheckbox *c, int checked)
 {
-	struct checkbox *cc = (struct checkbox *) (c->data);
+	struct checkbox *cc = (struct checkbox *) c;
 	GtkToggleButton *button;
 	gboolean active;
 
@@ -82,8 +62,34 @@ void uiCheckboxSetChecked(uiControl *c, int checked)
 	if (checked)
 		active = TRUE;
 	// we need to inhibit sending of ::toggled because this WILL send a ::toggled otherwise
-	button = GTK_TOGGLE_BUTTON(uiControlHandle(c));
+	button = GTK_TOGGLE_BUTTON(CHECKBOX(c));
 	g_signal_handler_block(button, cc->onToggledSignal);
 	gtk_toggle_button_set_active(button, active);
 	g_signal_handler_unblock(button, cc->onToggledSignal);
 }
+
+uiControl *uiNewCheckbox(const char *text)
+{
+	struct checkbox *c;
+	GtkWidget *widget;
+
+	c = uiNew(struct checkbox);
+
+	uiUnixNewControl(uiControl(c), GTK_TYPE_CHECK_BUTTON,
+		FALSE, FALSE,
+		"label", text,
+		NULL);
+
+	widget = GTK_WIDGET(CHECKBOX(c));
+	g_signal_connect(widget, "destroy", G_CALLBACK(onDestroy), c);
+	c->onToggledSignal = g_signal_connect(widget, "toggled", G_CALLBACK(onToggled), c);
+	c->onToggled = defaultOnToggled;
+
+	uiCheckbox(c)->Text = getText;
+	uiCheckbox(c)->SetText = setText;
+	uiCheckbox(c)->OnToggled = setOnToggled;
+	uiCheckbox(c)->Checked = getChecked;
+	uiCheckbox(c)->SetChecked = setChecked;
+
+	return uiCheckbox(c);
+}