queue_resize notebook after switch to avoid drawing problems. (Bug#856

Sat Aug 21 14:07:36 1999  Lars Hamann  <lars@gtk.org>

	* gtk/gtknotebook.c (gtk_notebook_real_switch_page): queue_resize
	notebook after switch to avoid drawing problems.
	(Bug#856 Reported by: Theodore Roth <troth@netmagic.net>)

	(gtk_notebook_pages_allocate): don't map not visible tab_labels,
	show them instead.
	(Bug#1805 Reported by: Dave Cole <dave@dccs.com.au>)

8 files changed, 85 insertions, 19 deletions

diff --git a/ChangeLog b/ChangeLog
index cd98c2fc6..6c6cadb3b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+Sat Aug 21 14:07:36 1999  Lars Hamann  <lars@gtk.org>
+
+	* gtk/gtknotebook.c (gtk_notebook_real_switch_page): queue_resize
+	notebook after switch to avoid drawing problems.
+	(Bug#856 Reported by: Theodore Roth <troth@netmagic.net>)
+	
+	(gtk_notebook_pages_allocate): don't map not visible tab_labels, 
+	show them instead. 
+	(Bug#1805 Reported by: Dave Cole <dave@dccs.com.au>)
+
 Wed Aug 18 09:20:10 1999  Tim Janik  <timj@gtk.org>
 
 	* gtk/gtkwindow.c:
diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0
index cd98c2fc6..6c6cadb3b 100644
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -1,3 +1,13 @@
+Sat Aug 21 14:07:36 1999  Lars Hamann  <lars@gtk.org>
+
+	* gtk/gtknotebook.c (gtk_notebook_real_switch_page): queue_resize
+	notebook after switch to avoid drawing problems.
+	(Bug#856 Reported by: Theodore Roth <troth@netmagic.net>)
+	
+	(gtk_notebook_pages_allocate): don't map not visible tab_labels, 
+	show them instead. 
+	(Bug#1805 Reported by: Dave Cole <dave@dccs.com.au>)
+
 Wed Aug 18 09:20:10 1999  Tim Janik  <timj@gtk.org>
 
 	* gtk/gtkwindow.c:
diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index cd98c2fc6..6c6cadb3b 100644
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,13 @@
+Sat Aug 21 14:07:36 1999  Lars Hamann  <lars@gtk.org>
+
+	* gtk/gtknotebook.c (gtk_notebook_real_switch_page): queue_resize
+	notebook after switch to avoid drawing problems.
+	(Bug#856 Reported by: Theodore Roth <troth@netmagic.net>)
+	
+	(gtk_notebook_pages_allocate): don't map not visible tab_labels, 
+	show them instead. 
+	(Bug#1805 Reported by: Dave Cole <dave@dccs.com.au>)
+
 Wed Aug 18 09:20:10 1999  Tim Janik  <timj@gtk.org>
 
 	* gtk/gtkwindow.c:
diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index cd98c2fc6..6c6cadb3b 100644
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,13 @@
+Sat Aug 21 14:07:36 1999  Lars Hamann  <lars@gtk.org>
+
+	* gtk/gtknotebook.c (gtk_notebook_real_switch_page): queue_resize
+	notebook after switch to avoid drawing problems.
+	(Bug#856 Reported by: Theodore Roth <troth@netmagic.net>)
+	
+	(gtk_notebook_pages_allocate): don't map not visible tab_labels, 
+	show them instead. 
+	(Bug#1805 Reported by: Dave Cole <dave@dccs.com.au>)
+
 Wed Aug 18 09:20:10 1999  Tim Janik  <timj@gtk.org>
 
 	* gtk/gtkwindow.c:
diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index cd98c2fc6..6c6cadb3b 100644
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,13 @@
+Sat Aug 21 14:07:36 1999  Lars Hamann  <lars@gtk.org>
+
+	* gtk/gtknotebook.c (gtk_notebook_real_switch_page): queue_resize
+	notebook after switch to avoid drawing problems.
+	(Bug#856 Reported by: Theodore Roth <troth@netmagic.net>)
+	
+	(gtk_notebook_pages_allocate): don't map not visible tab_labels, 
+	show them instead. 
+	(Bug#1805 Reported by: Dave Cole <dave@dccs.com.au>)
+
 Wed Aug 18 09:20:10 1999  Tim Janik  <timj@gtk.org>
 
 	* gtk/gtkwindow.c:
diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index cd98c2fc6..6c6cadb3b 100644
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,13 @@
+Sat Aug 21 14:07:36 1999  Lars Hamann  <lars@gtk.org>
+
+	* gtk/gtknotebook.c (gtk_notebook_real_switch_page): queue_resize
+	notebook after switch to avoid drawing problems.
+	(Bug#856 Reported by: Theodore Roth <troth@netmagic.net>)
+	
+	(gtk_notebook_pages_allocate): don't map not visible tab_labels, 
+	show them instead. 
+	(Bug#1805 Reported by: Dave Cole <dave@dccs.com.au>)
+
 Wed Aug 18 09:20:10 1999  Tim Janik  <timj@gtk.org>
 
 	* gtk/gtkwindow.c:
diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index cd98c2fc6..6c6cadb3b 100644
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,13 @@
+Sat Aug 21 14:07:36 1999  Lars Hamann  <lars@gtk.org>
+
+	* gtk/gtknotebook.c (gtk_notebook_real_switch_page): queue_resize
+	notebook after switch to avoid drawing problems.
+	(Bug#856 Reported by: Theodore Roth <troth@netmagic.net>)
+	
+	(gtk_notebook_pages_allocate): don't map not visible tab_labels, 
+	show them instead. 
+	(Bug#1805 Reported by: Dave Cole <dave@dccs.com.au>)
+
 Wed Aug 18 09:20:10 1999  Tim Janik  <timj@gtk.org>
 
 	* gtk/gtkwindow.c:
diff --git a/gtk/gtknotebook.c b/gtk/gtknotebook.c
index f0ea77e1e..27cae7781 100644
--- a/gtk/gtknotebook.c
+++ b/gtk/gtknotebook.c
@@ -2948,7 +2948,12 @@ gtk_notebook_pages_allocate (GtkNotebook   *notebook,
 
       if (GTK_WIDGET_REALIZED (notebook) &&
 	  page->tab_label && !GTK_WIDGET_MAPPED (page->tab_label))
-	gtk_widget_map (page->tab_label);
+	{
+	  if (GTK_WIDGET_VISIBLE (page->tab_label))
+	    gtk_widget_map (page->tab_label);
+	  else
+	    gtk_widget_show (page->tab_label);
+	}
     }
 
   if (children)
@@ -3016,7 +3021,12 @@ gtk_notebook_pages_allocate (GtkNotebook   *notebook,
 
 	  if (GTK_WIDGET_REALIZED (notebook) && page->tab_label &&
 	      !GTK_WIDGET_MAPPED (page->tab_label))
-	    gtk_widget_map (page->tab_label);
+	    {
+	      if (GTK_WIDGET_VISIBLE (page->tab_label))
+		gtk_widget_map (page->tab_label);
+	      else
+		gtk_widget_show (page->tab_label);
+	    }
 	}
     }
   gtk_notebook_set_shape (notebook);
@@ -3282,24 +3292,10 @@ gtk_notebook_real_switch_page (GtkNotebook     *notebook,
     notebook->focus_tab = 
       g_list_find (notebook->children, notebook->cur_page);
 
-  gtk_notebook_pages_allocate (notebook, &GTK_WIDGET (notebook)->allocation);
-  gtk_notebook_expose_tabs (notebook);
-  
   if (GTK_WIDGET_MAPPED (notebook))
-    {
-      if (GTK_WIDGET_REALIZED (notebook->cur_page->child))
-	gtk_widget_map (notebook->cur_page->child);
-      else
-	{
-	  gtk_widget_map (notebook->cur_page->child);
-	  gtk_widget_size_allocate (GTK_WIDGET (notebook), 
-				    &GTK_WIDGET (notebook)->allocation);
-	}
-    }
-  
-  if (GTK_WIDGET_DRAWABLE (notebook))
-    gtk_widget_queue_draw (GTK_WIDGET (notebook));
-  gtk_notebook_set_shape (notebook);
+    gtk_widget_map (notebook->cur_page->child);
+
+  gtk_widget_queue_resize (GTK_WIDGET (notebook));
 }
 
 /* Private GtkNotebook Page Switch Functions: