Remove the no longer needed workaround.

2005-05-18  Matthias Clasen  <mclasen@redhat.com>

	* gtk/gtkfilechooserdefault.c (gtk_file_chooser_default_init):
	Remove the no longer needed workaround.

diff --git a/ChangeLog b/ChangeLog
index 03514376e59fe447ff3257c4963c87a9490389e1..7f8e6b38b261799440931f93130efafa0bd22137 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
 2005-05-18  Matthias Clasen  <mclasen@redhat.com>
 
+       * gtk/gtkfilechooserdefault.c (gtk_file_chooser_default_init): 
+       Remove the no longer needed workaround.
+
+       * gtk/gtkwidget.c (widget_add_child_draw_rectangle): Only collect
+       allocations of mapped children.
+
        * gtk/gtkfilechooserdefault.c (gtk_file_chooser_default_init): 
        Add a bug reference.
 

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 03514376e59fe447ff3257c4963c87a9490389e1..7f8e6b38b261799440931f93130efafa0bd22137 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,5 +1,11 @@
 2005-05-18  Matthias Clasen  <mclasen@redhat.com>
 
+       * gtk/gtkfilechooserdefault.c (gtk_file_chooser_default_init): 
+       Remove the no longer needed workaround.
+
+       * gtk/gtkwidget.c (widget_add_child_draw_rectangle): Only collect
+       allocations of mapped children.
+
        * gtk/gtkfilechooserdefault.c (gtk_file_chooser_default_init): 
        Add a bug reference.
 

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 03514376e59fe447ff3257c4963c87a9490389e1..7f8e6b38b261799440931f93130efafa0bd22137 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,5 +1,11 @@
 2005-05-18  Matthias Clasen  <mclasen@redhat.com>
 
+       * gtk/gtkfilechooserdefault.c (gtk_file_chooser_default_init): 
+       Remove the no longer needed workaround.
+
+       * gtk/gtkwidget.c (widget_add_child_draw_rectangle): Only collect
+       allocations of mapped children.
+
        * gtk/gtkfilechooserdefault.c (gtk_file_chooser_default_init): 
        Add a bug reference.
 

diff --git a/gtk/gtkfilechooserdefault.c b/gtk/gtkfilechooserdefault.c
index b5f725db62ac54a64e9c53480b9354334f8630e1..41c61aa8b99e5f8652c457e4ed66670d020c1ac3 100644 (file)
--- a/gtk/gtkfilechooserdefault.c
+++ b/gtk/gtkfilechooserdefault.c
@@ -670,8 +670,6 @@ gtk_file_chooser_default_init (GtkFileChooserDefault *impl)
   impl->load_state = LOAD_EMPTY;
   impl->pending_select_paths = NULL;
 
-  /* this is a workaround for bug #135903 */
-  gtk_widget_set_redraw_on_allocate (GTK_WIDGET (impl), TRUE);
   gtk_box_set_spacing (GTK_BOX (impl), 12);
 
   impl->tooltips = gtk_tooltips_new ();

diff --git a/gtk/gtkwidget.c b/gtk/gtkwidget.c
index da8bbaa5b4535c8283f1fbee8a0e929afe8fe9d9..7b925a50c9cb0a3bc976fa495134add4e75978a2 100644 (file)
--- a/gtk/gtkwidget.c
+++ b/gtk/gtkwidget.c
@@ -2444,7 +2444,7 @@ widget_add_child_draw_rectangle (GtkWidget    *widget,
 {
   GdkRectangle child_rect;
   
-  if (!GTK_WIDGET_REALIZED (widget) ||
+  if (!GTK_WIDGET_MAPPED (widget) ||
       widget->window != widget->parent->window)
     return;