interesting
/
libui
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed compilation issues. Now to implement uiButton on GTK+.

This commit is contained in:
Pietro Gagliardi 2015-04-07 13:37:03 -04:00
parent ce232fdc7e
commit 880f052282
3 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
container_unix.c
View File

@ -39,7 +39,7 @@ static void uiContainer_size_allocate(GtkWidget *widget, GtkAllocation *allocati
gtk_widget_set_allocation(widget, allocation); gtk_widget_set_allocation(widget, allocation);
c = uiContainer(widget)->child; 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 { struct forall {
@ -51,7 +51,7 @@ static void doforall(gpointer obj, gpointer data)
{ {
struct forall *s = (struct forall *) 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) static void uiContainer_forall(GtkContainer *container, gboolean includeInternals, GtkCallback callback, gpointer data)

4
newcontrol_unix.c
View File

@ -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) 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->widget = GTK_WIDGET(g_object_newv(type, nConstructParams, constructParams));
c->immediate = c->widget; c->immediate = c->widget;

4
uipriv_unix.h
View File

@ -7,6 +7,10 @@
#include "uipriv.h" #include "uipriv.h"
#include "ui_unix.h" #include "ui_unix.h"
// TODO move this to the right place
struct uiSizing {
};
// container_unix.c // container_unix.c
#define uiContainerType (uiContainer_get_type()) #define uiContainerType (uiContainer_get_type())
#define uiContainer(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj), uiContainerType, uiContainer)) #define uiContainer(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj), uiContainerType, uiContainer))