Fox around a bug in GTK's GtkNotebook

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@2339 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/src/gtk/win_gtk.c b/src/gtk/win_gtk.c
index 9a9f3e5f7bf1e1f555118d779d3441ad85345dd7..0477047b3c9db69d77c75d3235255aa08489fe15 100644 (file)
--- a/src/gtk/win_gtk.c
+++ b/src/gtk/win_gtk.c
@@ -9,6 +9,7 @@
 
 #include "wx/gtk/win_gtk.h"
 #include "gtk/gtksignal.h"
+#include "gtk/gtknotebook.h"
 
 #ifdef __cplusplus
 extern "C" {
@@ -450,7 +451,9 @@ gtk_myfixed_size_allocate (GtkWidget     *widget,
  
       /* 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) && GTK_WIDGET_REALIZED(child->widget) )
+      if (GTK_WIDGET_VISIBLE (child->widget) && 
+         !(!GTK_WIDGET_REALIZED(child->widget) &&
+           GTK_IS_NOTEBOOK(child->widget) ))
        {
          child_allocation.x = child->x;
          child_allocation.y = child->y;

diff --git a/src/gtk1/win_gtk.c b/src/gtk1/win_gtk.c
index 9a9f3e5f7bf1e1f555118d779d3441ad85345dd7..0477047b3c9db69d77c75d3235255aa08489fe15 100644 (file)
--- a/src/gtk1/win_gtk.c
+++ b/src/gtk1/win_gtk.c
@@ -9,6 +9,7 @@
 
 #include "wx/gtk/win_gtk.h"
 #include "gtk/gtksignal.h"
+#include "gtk/gtknotebook.h"
 
 #ifdef __cplusplus
 extern "C" {
@@ -450,7 +451,9 @@ gtk_myfixed_size_allocate (GtkWidget     *widget,
  
       /* 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) && GTK_WIDGET_REALIZED(child->widget) )
+      if (GTK_WIDGET_VISIBLE (child->widget) && 
+         !(!GTK_WIDGET_REALIZED(child->widget) &&
+           GTK_IS_NOTEBOOK(child->widget) ))
        {
          child_allocation.x = child->x;
          child_allocation.y = child->y;