diff options
| -rw-r--r-- | new/container_unix.c | 4 | ||||
| -rw-r--r-- | new/newcontrol_unix.c | 4 | ||||
| -rw-r--r-- | new/uipriv_unix.h | 4 |
3 files changed, 8 insertions, 4 deletions
diff --git a/new/container_unix.c b/new/container_unix.c index ab0298f..d961d02 100644 --- a/new/container_unix.c +++ b/new/container_unix.c @@ -39,7 +39,7 @@ static void uiContainer_size_allocate(GtkWidget *widget, GtkAllocation *allocati gtk_widget_set_allocation(widget, allocation); c = uiContainer(widget)->child; - (*(c->resize))(widget, allocation.x, allocation.y, allocation.width, allocation.height, &d); + (*(c->resize))(c, allocation->x, allocation->y, allocation->width, allocation->height, &d); } struct forall { @@ -51,7 +51,7 @@ static void doforall(gpointer obj, gpointer data) { struct forall *s = (struct forall *) data; - (*(s->callback))(uiContainer(obj), s->data); + (*(s->callback))(GTK_WIDGET(obj), s->data); } static void uiContainer_forall(GtkContainer *container, gboolean includeInternals, GtkCallback callback, gpointer data) diff --git a/new/newcontrol_unix.c b/new/newcontrol_unix.c index dd4e4eb..0523bd3 100644 --- a/new/newcontrol_unix.c +++ b/new/newcontrol_unix.c @@ -62,9 +62,9 @@ static void singleContainerHide(uiControl *c) uiControl *uiUnixNewControl(GType type, guint nConstructParams, GParameter *constructParams, gboolean inScrolledWindow, gboolean needsViewport, gboolean scrolledWindowHasBorder, void *data) { - uiSingleHWNDControl *c; + uiSingleWidgetControl *c; - c = g_new0(uiSingleHWNDControl, 1); + c = g_new0(uiSingleWidgetControl, 1); c->widget = GTK_WIDGET(g_object_newv(type, nConstructParams, constructParams)); c->immediate = c->widget; diff --git a/new/uipriv_unix.h b/new/uipriv_unix.h index 95b2468..1ee2269 100644 --- a/new/uipriv_unix.h +++ b/new/uipriv_unix.h @@ -7,6 +7,10 @@ #include "uipriv.h" #include "ui_unix.h" +// TODO move this to the right place +struct uiSizing { +}; + // container_unix.c #define uiContainerType (uiContainer_get_type()) #define uiContainer(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj), uiContainerType, uiContainer)) |