From cdd310fa7d41a03b68c5c8bb2cc7a065199b272e Mon Sep 17 00:00:00 2001 From: Pietro Gagliardi Date: Tue, 28 Apr 2015 13:06:53 -0400 Subject: [PATCH] Fixed build issues. Now to fix runtime issues. --- new/unix/container.c | 6 +++--- new/unix/window.c | 8 ++++---- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/new/unix/container.c b/new/unix/container.c index f8ace608..da0ebee8 100644 --- a/new/unix/container.c +++ b/new/unix/container.c @@ -92,9 +92,9 @@ static void doforall(gpointer obj, gpointer 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; s.callback = callback; @@ -205,7 +205,7 @@ static void containerDisable(uiControl *cc) static void containerUpdate(uiContainer *cc) { - containerWidget *c = containerWidget(cc->Internal); + containerWidget *c = containerWidget(uiControl(cc)->Internal); gtk_widget_queue_resize(GTK_WIDGET(c)); } diff --git a/new/unix/window.c b/new/unix/window.c index 17f8a50b..13962177 100644 --- a/new/unix/window.c +++ b/new/unix/window.c @@ -173,14 +173,14 @@ uiWindow *uiNewWindow(const char *title, int width, int height, int hasMenubar) w->window = GTK_WINDOW(w->widget); w->vboxWidget = gtk_box_new(GTK_ORIENTATION_VERTICAL, 0); - w->vboxContainer = GTK_CONTAINER(w->vboxwidget); - w->vbox = GTK_BOX(w->vboxwidget); + w->vboxContainer = GTK_CONTAINER(w->vboxWidget); + w->vbox = GTK_BOX(w->vboxWidget); // set the vbox as the GtkWindow child - gtk_container_add(w->container, w->vboxwidget); + gtk_container_add(w->container, w->vboxWidget); if (hasMenubar) - gtk_container_add(w->vboxcontainer, makeMenubar(uiWindow(w))); + gtk_container_add(w->vboxContainer, makeMenubar(uiWindow(w))); w->bin = newBin(); binWidget = GTK_WIDGET(uiControlHandle(uiControl(w->bin)));