interesting
/
andlabs-ui
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Cleaned up unix/button.c a bit.

This commit is contained in:
Pietro Gagliardi 2015-04-16 16:38:33 -04:00
parent 3644d2cfb2
commit de9d72299f
2 changed files with 17 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
new/unix/button.c
View File

@ -7,7 +7,7 @@ struct button {
void *onClickedData; void *onClickedData;
}; };
static void onClicked(GtkButton *button, gpointer data) static void clicked(GtkButton *button, gpointer data)
{ {
struct button *b = (struct button *) data; struct button *b = (struct button *) data;
@ -19,26 +19,26 @@ static void defaultOnClicked(uiButton *b, void *data)
// do nothing // do nothing
} }
static void onDestroy(GtkWidget *widget, gpointer data) static void destroy(GtkWidget *widget, gpointer data)
{ {
struct button *b = (struct button *) data; struct button *b = (struct button *) data;
uiFree(b); uiFree(b);
} }
#define BUTTON(b) GTK_BUTTON(uiControlHandle(uiControl(b))) #define BUTTON(b) GTK_BUTTON(widget(b))
static char *getText(uiButton *b) static char *buttonText(uiButton *bb)
{ {
return g_strdup(gtk_button_get_label(BUTTON(b))); return g_strdup(gtk_button_get_label(BUTTON(bb)));
} }
static void setText(uiButton *b, const char *text) static void buttonSetText(uiButton *bb, const char *text)
{ {
gtk_button_set_label(BUTTON(b), text); gtk_button_set_label(BUTTON(bb), text);
} }
static void setOnClicked(uiButton *bb, void (*f)(uiButton *, void *), void *data) static void buttonOnClicked(uiButton *bb, void (*f)(uiButton *, void *), void *data)
{ {
struct button *b = (struct button *) bb; struct button *b = (struct button *) bb;
@ -58,14 +58,14 @@ uiButton *uiNewButton(const char *text)
"label", text, "label", text,
NULL); NULL);
widget = GTK_WIDGET(BUTTON(b)); widget = WIDGET(b);
g_signal_connect(widget, "clicked", G_CALLBACK(onClicked), b); g_signal_connect(widget, "clicked", G_CALLBACK(clicked), b);
g_signal_connect(widget, "destroy", G_CALLBACK(onDestroy), b); g_signal_connect(widget, "destroy", G_CALLBACK(destroy), b);
b->onClicked = defaultOnClicked; b->onClicked = defaultOnClicked;
uiButton(b)->Text = getText; uiButton(b)->Text = buttonText;
uiButton(b)->SetText = setText; uiButton(b)->SetText = buttonSetText;
uiButton(b)->OnClicked = setOnClicked; uiButton(b)->OnClicked = buttonOnClicked;
return uiButton(b); return uiButton(b);
} }

3
new/unix/uipriv_unix.h
View File

@ -9,3 +9,6 @@
#define gtkXMargin 12 #define gtkXMargin 12
#define gtkYMargin 12 #define gtkYMargin 12
#define widget(c) uiControlHandle(uiControl(c))
#define WIDGET(c) GTK_WIDGET(widget(c))