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

More unix/newcontrol.c conversion.

This commit is contained in:
Pietro Gagliardi 2015-04-15 21:39:50 -04:00
parent a25f49e7e6
commit 18d7bf670d
1 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
new/unix/newcontrol.c
View File

@ -16,21 +16,21 @@ struct singleWidget {
static void singleDestroy(uiControl *c) static void singleDestroy(uiControl *c)
{ {
singleWidget *s = (singleWidget *) (c->internal); singleWidget *s = (singleWidget *) (c->Internal);
gtk_widget_destroy(s->immediate); gtk_widget_destroy(s->immediate);
} }
static uintptr_t singleHandle(uiControl *c) static uintptr_t singleHandle(uiControl *c)
{ {
singleWidget *s = (singleWidget *) (c->internal); singleWidget *s = (singleWidget *) (c->Internal);
return (uintptr_t) (s->widget); return (uintptr_t) (s->widget);
} }
static void singleSetParent(uiControl *c, uiParent *parent) static void singleSetParent(uiControl *c, uiParent *parent)
{ {
singleWidget *s = (singleWidget *) (c->internal); singleWidget *s = (singleWidget *) (c->Internal);
uiParent *oldparent; uiParent *oldparent;
oldparent = s->parent; oldparent = s->parent;
@ -47,7 +47,7 @@ static void singleSetParent(uiControl *c, uiParent *parent)
static void singlePreferredSize(uiControl *c, uiSizing *d, intmax_t *width, intmax_t *height) static void singlePreferredSize(uiControl *c, uiSizing *d, intmax_t *width, intmax_t *height)
{ {
singleWidget *s = (singleWidget *) (c->internal); singleWidget *s = (singleWidget *) (c->Internal);
GtkRequisition natural; GtkRequisition natural;
// use the natural size as the minimum size is an *absolute* minimum // use the natural size as the minimum size is an *absolute* minimum
@ -60,7 +60,7 @@ static void singlePreferredSize(uiControl *c, uiSizing *d, intmax_t *width, intm
static void singleResize(uiControl *c, intmax_t x, intmax_t y, intmax_t width, intmax_t height, uiSizing *d) static void singleResize(uiControl *c, intmax_t x, intmax_t y, intmax_t width, intmax_t height, uiSizing *d)
{ {
singleWidget *s = (singleWidget *) (c->internal); singleWidget *s = (singleWidget *) (c->Internal);
GtkAllocation a; GtkAllocation a;
a.x = x; a.x = x;
@ -72,7 +72,7 @@ static void singleResize(uiControl *c, intmax_t x, intmax_t y, intmax_t width, i
static int singleVisible(uiControl *c) static int singleVisible(uiControl *c)
{ {
singleWidget *s = (singleWidget *) (c->internal); singleWidget *s = (singleWidget *) (c->Internal);
if (s->userHid) if (s->userHid)
return 0; return 0;
@ -81,7 +81,7 @@ static int singleVisible(uiControl *c)
static void singleShow(uiControl *c) static void singleShow(uiControl *c)
{ {
singleWidget *s = (singleWidget *) (c->internal); singleWidget *s = (singleWidget *) (c->Internal);
s->userHid = FALSE; s->userHid = FALSE;
if (!s->containerHid) { if (!s->containerHid) {
@ -93,7 +93,7 @@ static void singleShow(uiControl *c)
static void singleHide(uiControl *c) static void singleHide(uiControl *c)
{ {
singleWidget *s = (singleWidget *) (c->internal); singleWidget *s = (singleWidget *) (c->Internal);
s->userHid = TRUE; s->userHid = TRUE;
gtk_widget_hide(s->immediate); gtk_widget_hide(s->immediate);
@ -103,7 +103,7 @@ static void singleHide(uiControl *c)
static void singleContainerShow(uiControl *c) static void singleContainerShow(uiControl *c)
{ {
singleWidget *s = (singleWidget *) (c->internal); singleWidget *s = (singleWidget *) (c->Internal);
s->containerHid = FALSE; s->containerHid = FALSE;
if (!s->userHid) { if (!s->userHid) {
@ -115,7 +115,7 @@ static void singleContainerShow(uiControl *c)
static void singleContainerHide(uiControl *c) static void singleContainerHide(uiControl *c)
{ {
singleWidget *s = (singleWidget *) (c->internal); singleWidget *s = (singleWidget *) (c->Internal);
s->containerHid = TRUE; s->containerHid = TRUE;
gtk_widget_hide(s->immediate); gtk_widget_hide(s->immediate);
@ -125,7 +125,7 @@ static void singleContainerHide(uiControl *c)
static void singleEnable(uiControl *c) static void singleEnable(uiControl *c)
{ {
singleWidget *s = (singleWidget *) (c->internal); singleWidget *s = (singleWidget *) (c->Internal);
s->userDisabled = FALSE; s->userDisabled = FALSE;
if (!s->containerDisabled) if (!s->containerDisabled)
@ -134,7 +134,7 @@ static void singleEnable(uiControl *c)
static void singleDisable(uiControl *c) static void singleDisable(uiControl *c)
{ {
singleWidget *s = (singleWidget *) (c->internal); singleWidget *s = (singleWidget *) (c->Internal);
s->userDisabled = TRUE; s->userDisabled = TRUE;
gtk_widget_set_sensitive(s->immediate, FALSE); gtk_widget_set_sensitive(s->immediate, FALSE);
@ -142,7 +142,7 @@ static void singleDisable(uiControl *c)
static void singleContainerEnable(uiControl *c) static void singleContainerEnable(uiControl *c)
{ {
singleWidget *s = (singleWidget *) (c->internal); singleWidget *s = (singleWidget *) (c->Internal);
s->containerDisabled = FALSE; s->containerDisabled = FALSE;
if (!s->userDisabled) if (!s->userDisabled)
@ -151,7 +151,7 @@ static void singleContainerEnable(uiControl *c)
static void singleContainerDisable(uiControl *c) static void singleContainerDisable(uiControl *c)
{ {
singleWidget *s = (singleWidget *) (c->internal); singleWidget *s = (singleWidget *) (c->Internal);
s->containerDisabled = TRUE; s->containerDisabled = TRUE;
gtk_widget_set_sensitive(s->immediate, FALSE); gtk_widget_set_sensitive(s->immediate, FALSE);
@ -159,8 +159,7 @@ static void singleContainerDisable(uiControl *c)
static void onDestroy(GtkWidget *widget, gpointer data) static void onDestroy(GtkWidget *widget, gpointer data)
{ {
uiControl *c = uiControl(data); singleWidget *s = (singleWidget *) data;
singleWidget *s = (singleWidget *) (c->internal);
uiFree(s); uiFree(s);
} }
@ -216,11 +215,12 @@ void uiUnixNewControl(uiControl *c, GType type, gboolean inScrolledWindow, gbool
c->containerDisable = singleContainerDisable; c->containerDisable = singleContainerDisable;
// and let's free everything with the immediate widget // and let's free everything with the immediate widget
g_signal_connect(s->immediate, "destroy", G_CALLBACK(onDestroy), c); // we send s as data instead of c just in case c is gone by then
g_signal_connect(s->immediate, "destroy", G_CALLBACK(onDestroy), s);
// finally, call gtk_widget_show_all() here to set the initial visibility of the widget // finally, call gtk_widget_show_all() here to set the initial visibility of the widget
gtk_widget_show_all(s->immediate); gtk_widget_show_all(s->immediate);
c->internal = s; c->Internal = s;
return c; return c;
} }