X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/d1af991f497a5e95d8f8ab15a4e4a4a4c375928f..503f414edd46512b73e9abee54ff988eca42451e:/src/gtk1/win_gtk.c diff --git a/src/gtk1/win_gtk.c b/src/gtk1/win_gtk.c index dcd694df3f..a9552bd63b 100644 --- a/src/gtk1/win_gtk.c +++ b/src/gtk1/win_gtk.c @@ -10,7 +10,7 @@ #include "wx/gtk/win_gtk.h" #include "gtk/gtksignal.h" #include "gtk/gtknotebook.h" -#include "gtk/gtktable.h" +#include "gtk/gtkscrolledwindow.h" #ifdef __cplusplus extern "C" { @@ -328,9 +328,9 @@ gtk_myfixed_set_size (GtkMyFixed *myfixed, if (GTK_WIDGET_VISIBLE (widget) && GTK_WIDGET_VISIBLE (myfixed)) { - if ( ((child->width > 1) && (child->height > 1) && (GTK_WIDGET_REALIZED(widget))) || - /* I don't know why GtkTable is different */ - GTK_IS_TABLE(widget)) + if ( (child->width > 1) && + (child->height > 1) && + !(GTK_WIDGET_REALIZED(widget) && GTK_IS_NOTEBOOK(widget)) ) { child_allocation.x = child->x; child_allocation.y = child->y; @@ -537,15 +537,15 @@ gtk_myfixed_size_allocate (GtkWidget *widget, child = children->data; children = children->next; - /* please look at the text in wxWindow::DoSetSize() on why the - test GTK_WIDGET_REALIZED() has to be here */ if (GTK_WIDGET_VISIBLE (child->widget)) { +/* please look at the text in wxWindow::DoSetSize() on why the + test GTK_WIDGET_REALIZED() has to be here */ /* if (GTK_IS_NOTEBOOK(child->widget) && !GTK_WIDGET_REALIZED(child->widget)) { gtk_widget_queue_resize( child->widget ); } - else */ + else */ { child_allocation.x = child->x; child_allocation.y = child->y;