From 1e2dee7ab3351215362e78140435104b7d0dd0e2 Mon Sep 17 00:00:00 2001 From: Pietro Gagliardi Date: Tue, 28 Apr 2015 12:07:07 -0400 Subject: [PATCH] Fixed some missing pieces in unix/container.c. --- new/unix/OLDcontainer.c | 10 ---------- new/unix/container.c | 3 +++ 2 files changed, 3 insertions(+), 10 deletions(-) diff --git a/new/unix/OLDcontainer.c b/new/unix/OLDcontainer.c index 254865ae..6db8d7e1 100644 --- a/new/unix/OLDcontainer.c +++ b/new/unix/OLDcontainer.c @@ -1,25 +1,15 @@ // 13 august 2014 #include "uipriv_unix.h" -#define gtkXPadding 12 -#define gtkYPadding 6 static void uipOSContainer_size_allocate(GtkWidget *widget, GtkAllocation *allocation) { - uipOSContainer *c = uipOSContainer(widget); - uiSizing d; intmax_t x, y, width, height; - gtk_widget_set_allocation(GTK_WIDGET(c), allocation); - if (c->mainControl == NULL) - return; x = allocation->x + c->marginLeft; y = allocation->y + c->marginTop; width = allocation->width - (c->marginLeft + c->marginRight); height = allocation->height - (c->marginTop + c->marginBottom); - d.xPadding = gtkXPadding; - d.yPadding = gtkYPadding; - uiControlResize(c->mainControl, x, y, width, height, &d); } diff --git a/new/unix/container.c b/new/unix/container.c index 4b537a51..f8ace608 100644 --- a/new/unix/container.c +++ b/new/unix/container.c @@ -66,6 +66,9 @@ static void containerWidget_remove(GtkContainer *container, GtkWidget *widget) complain("widget %p not found in containerWidget gtk_container_remove()", widget); } +#define gtkXPadding 12 +#define gtkYPadding 6 + static void containerWidget_size_allocate(GtkWidget *widget, GtkAllocation *allocation) { containerWidget *c = containerWidget(widget);