Merges from gtk-1-2

[~andy/gtk] / gtk / gtknotebook.c

diff --git a/gtk/gtknotebook.c b/gtk/gtknotebook.c
index 2a3b0ff2ac87b38ba4ff8d14e702d2347ca10faa..676cade045a7c90edeed664f8702a3e5bc02023f 100644 (file)
--- a/gtk/gtknotebook.c
+++ b/gtk/gtknotebook.c
@@ -514,8 +514,8 @@ gtk_notebook_map (GtkWidget *widget)
          page = children->data;
          children = children->next;
 
-         if (page->tab_label && 
-             GTK_WIDGET_VISIBLE (page->child) && 
+         if (page->tab_label &&
+             GTK_WIDGET_VISIBLE (page->tab_label) &&
              !GTK_WIDGET_MAPPED (page->tab_label))
            gtk_widget_map (page->tab_label);
        }
@@ -803,6 +803,17 @@ gtk_notebook_size_request (GtkWidget      *widget,
                }
            }
        }
+      else
+       {
+         for (children = notebook->children; children;
+              children = children->next)
+           {
+             page = children->data;
+             
+             if (page->tab_label && GTK_WIDGET_VISIBLE (page->tab_label))
+               gtk_widget_hide (page->tab_label);
+           }
+       }
     }
 
   widget->requisition.width += GTK_CONTAINER (widget)->border_width * 2;