Fixed build issues. Now to fix runtime issues.
This commit is contained in:
parent
53914cc6cd
commit
cdd310fa7d
|
@ -92,9 +92,9 @@ static void doforall(gpointer obj, gpointer data)
|
||||||
(*(s->callback))(GTK_WIDGET(obj), s->data);
|
(*(s->callback))(GTK_WIDGET(obj), s->data);
|
||||||
}
|
}
|
||||||
|
|
||||||
static void uipOSContainer_forall(GtkContainer *container, gboolean includeInternals, GtkCallback callback, gpointer data)
|
static void containerWidget_forall(GtkContainer *container, gboolean includeInternals, GtkCallback callback, gpointer data)
|
||||||
{
|
{
|
||||||
uipOSContainer *c = uipOSContainer(container);
|
containerWidget *c = containerWidget(container);
|
||||||
struct forall s;
|
struct forall s;
|
||||||
|
|
||||||
s.callback = callback;
|
s.callback = callback;
|
||||||
|
@ -205,7 +205,7 @@ static void containerDisable(uiControl *cc)
|
||||||
|
|
||||||
static void containerUpdate(uiContainer *cc)
|
static void containerUpdate(uiContainer *cc)
|
||||||
{
|
{
|
||||||
containerWidget *c = containerWidget(cc->Internal);
|
containerWidget *c = containerWidget(uiControl(cc)->Internal);
|
||||||
|
|
||||||
gtk_widget_queue_resize(GTK_WIDGET(c));
|
gtk_widget_queue_resize(GTK_WIDGET(c));
|
||||||
}
|
}
|
||||||
|
|
|
@ -173,14 +173,14 @@ uiWindow *uiNewWindow(const char *title, int width, int height, int hasMenubar)
|
||||||
w->window = GTK_WINDOW(w->widget);
|
w->window = GTK_WINDOW(w->widget);
|
||||||
|
|
||||||
w->vboxWidget = gtk_box_new(GTK_ORIENTATION_VERTICAL, 0);
|
w->vboxWidget = gtk_box_new(GTK_ORIENTATION_VERTICAL, 0);
|
||||||
w->vboxContainer = GTK_CONTAINER(w->vboxwidget);
|
w->vboxContainer = GTK_CONTAINER(w->vboxWidget);
|
||||||
w->vbox = GTK_BOX(w->vboxwidget);
|
w->vbox = GTK_BOX(w->vboxWidget);
|
||||||
|
|
||||||
// set the vbox as the GtkWindow child
|
// set the vbox as the GtkWindow child
|
||||||
gtk_container_add(w->container, w->vboxwidget);
|
gtk_container_add(w->container, w->vboxWidget);
|
||||||
|
|
||||||
if (hasMenubar)
|
if (hasMenubar)
|
||||||
gtk_container_add(w->vboxcontainer, makeMenubar(uiWindow(w)));
|
gtk_container_add(w->vboxContainer, makeMenubar(uiWindow(w)));
|
||||||
|
|
||||||
w->bin = newBin();
|
w->bin = newBin();
|
||||||
binWidget = GTK_WIDGET(uiControlHandle(uiControl(w->bin)));
|
binWidget = GTK_WIDGET(uiControlHandle(uiControl(w->bin)));
|
||||||
|
|
Loading…
Reference in New Issue