From 27f53394bef782f7beb83e4516ec267c6b660cda Mon Sep 17 00:00:00 2001 From: Carlos Garnacho Date: Tue, 18 Apr 2006 09:55:51 +0000 Subject: [PATCH] removed wrong condition check that caused tab labels not to be drawn under 2006-04-18 Carlos Garnacho * gtk/gtknotebook.c (gtk_notebook_pages_allocate): removed wrong condition check that caused tab labels not to be drawn under certain circumstances. Bug #338734. --- ChangeLog | 6 ++++++ ChangeLog.pre-2-10 | 6 ++++++ gtk/gtknotebook.c | 5 +---- 3 files changed, 13 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index 511f7705e..40d875b95 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2006-04-18 Carlos Garnacho + + * gtk/gtknotebook.c (gtk_notebook_pages_allocate): removed wrong + condition check that caused tab labels not to be drawn under certain + circumstances. Bug #338734. + 2006-04-17 Kjartan Maraas * configure.in: Remove obsolete entry for no_NO diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 511f7705e..40d875b95 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,9 @@ +2006-04-18 Carlos Garnacho + + * gtk/gtknotebook.c (gtk_notebook_pages_allocate): removed wrong + condition check that caused tab labels not to be drawn under certain + circumstances. Bug #338734. + 2006-04-17 Kjartan Maraas * configure.in: Remove obsolete entry for no_NO diff --git a/gtk/gtknotebook.c b/gtk/gtknotebook.c index e7121d634..2800cd68e 100644 --- a/gtk/gtknotebook.c +++ b/gtk/gtknotebook.c @@ -5110,11 +5110,8 @@ gtk_notebook_pages_allocate (GtkNotebook *notebook, while (children) { - page = children->data; + gtk_notebook_page_allocate (notebook, GTK_NOTEBOOK_PAGE (children)); children = children->next; - - if (GTK_WIDGET_DRAWABLE (page->tab_label)) - gtk_notebook_page_allocate (notebook, page); } gtk_notebook_redraw_tabs (notebook);