revert accidentally committed !redraw_on_allocate change.

Wed Sep 17 02:38:53 2003  Soeren Sandmann  <sandmann@daimi.au.dk>

	* gtk/gtktoolbar.c (gtk_toolbar_class_init): revert accidentally
	committed !redraw_on_allocate change.

diff --git a/ChangeLog b/ChangeLog
index 7fc7c8a963a03341013320f637f8bf2d43d41269..39a7bf2af95134dcffdf10fbf9cc996f83974298 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Wed Sep 17 02:38:53 2003  Soeren Sandmann  <sandmann@daimi.au.dk>
+
+       * gtk/gtktoolbar.c (gtk_toolbar_class_init): revert accidentally
+       committed redraw_on_allocate change.
+
 Tue Sep 16 10:42:00 2003  Eric Warmenhoven  <eric@warmenhoven.org>
 
        * gdk/linux-fb/gdkwindow-fb.c: Add gdk_window_set_keep_{above,below}

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 7fc7c8a963a03341013320f637f8bf2d43d41269..39a7bf2af95134dcffdf10fbf9cc996f83974298 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,8 @@
+Wed Sep 17 02:38:53 2003  Soeren Sandmann  <sandmann@daimi.au.dk>
+
+       * gtk/gtktoolbar.c (gtk_toolbar_class_init): revert accidentally
+       committed redraw_on_allocate change.
+
 Tue Sep 16 10:42:00 2003  Eric Warmenhoven  <eric@warmenhoven.org>
 
        * gdk/linux-fb/gdkwindow-fb.c: Add gdk_window_set_keep_{above,below}

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index 7fc7c8a963a03341013320f637f8bf2d43d41269..39a7bf2af95134dcffdf10fbf9cc996f83974298 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,8 @@
+Wed Sep 17 02:38:53 2003  Soeren Sandmann  <sandmann@daimi.au.dk>
+
+       * gtk/gtktoolbar.c (gtk_toolbar_class_init): revert accidentally
+       committed redraw_on_allocate change.
+
 Tue Sep 16 10:42:00 2003  Eric Warmenhoven  <eric@warmenhoven.org>
 
        * gdk/linux-fb/gdkwindow-fb.c: Add gdk_window_set_keep_{above,below}

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 7fc7c8a963a03341013320f637f8bf2d43d41269..39a7bf2af95134dcffdf10fbf9cc996f83974298 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,8 @@
+Wed Sep 17 02:38:53 2003  Soeren Sandmann  <sandmann@daimi.au.dk>
+
+       * gtk/gtktoolbar.c (gtk_toolbar_class_init): revert accidentally
+       committed redraw_on_allocate change.
+
 Tue Sep 16 10:42:00 2003  Eric Warmenhoven  <eric@warmenhoven.org>
 
        * gdk/linux-fb/gdkwindow-fb.c: Add gdk_window_set_keep_{above,below}

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 7fc7c8a963a03341013320f637f8bf2d43d41269..39a7bf2af95134dcffdf10fbf9cc996f83974298 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,8 @@
+Wed Sep 17 02:38:53 2003  Soeren Sandmann  <sandmann@daimi.au.dk>
+
+       * gtk/gtktoolbar.c (gtk_toolbar_class_init): revert accidentally
+       committed redraw_on_allocate change.
+
 Tue Sep 16 10:42:00 2003  Eric Warmenhoven  <eric@warmenhoven.org>
 
        * gdk/linux-fb/gdkwindow-fb.c: Add gdk_window_set_keep_{above,below}

diff --git a/gtk/gtktoolbar.c b/gtk/gtktoolbar.c
index bfa022c8fdd4deac55b4cde9c510987f5eada567..bb802079c39a6f26503ef3fd01f6e5dfef12e65e 100644 (file)
--- a/gtk/gtktoolbar.c
+++ b/gtk/gtktoolbar.c
@@ -556,8 +556,6 @@ gtk_toolbar_init (GtkToolbar *toolbar)
   GTK_WIDGET_SET_FLAGS (toolbar, GTK_NO_WINDOW);
 
   priv = GTK_TOOLBAR_GET_PRIVATE (toolbar);
-
-  gtk_widget_set_redraw_on_allocate (toolbar, FALSE);
   
   toolbar->orientation = GTK_ORIENTATION_HORIZONTAL;
   toolbar->style = DEFAULT_TOOLBAR_STYLE;
@@ -1028,36 +1026,6 @@ get_item_size (GtkToolbar *toolbar,
     }
 }
 
-static void
-invalidate_border (GtkToolbar *toolbar)
-{
-  GtkWidget *widget = GTK_WIDGET (toolbar);
-  
-  if (get_shadow_type (toolbar) != GTK_SHADOW_NONE)
-    {
-      GdkRegion *invalid;
-      GdkRectangle inner_rect;
-      GdkRegion *inner_region;
-      gint xborder = widget->style->xthickness + GTK_CONTAINER (widget)->border_width;
-      gint yborder = widget->style->ythickness + GTK_CONTAINER (widget)->border_width;
-
-      inner_rect.x = widget->allocation.x + xborder;
-      inner_rect.y = widget->allocation.y + yborder;
-      inner_rect.width = widget->allocation.width - 2 * xborder;
-      inner_rect.height = widget->allocation.height - 2 * yborder;
-
-      inner_region = gdk_region_rectangle (&inner_rect);
-
-      invalid = gdk_region_rectangle (&(widget->allocation));
-      gdk_region_subtract (invalid, inner_region);
-      
-      gdk_window_invalidate_region (widget->window, invalid, FALSE);
-
-      gdk_region_destroy (invalid);
-      gdk_region_destroy (inner_region);
-    }
-}
-
 static void
 gtk_toolbar_size_allocate (GtkWidget     *widget,
                           GtkAllocation *allocation)
@@ -1079,14 +1047,8 @@ gtk_toolbar_size_allocate (GtkWidget     *widget,
   GList *items;
   GtkRequisition arrow_requisition;
 
-  if (GTK_WIDGET_REALIZED (toolbar))
-    invalidate_border (toolbar);
-  
   widget->allocation = *allocation;
 
-  if (GTK_WIDGET_REALIZED (toolbar))
-    invalidate_border (toolbar);
-  
   border_width = GTK_CONTAINER (toolbar)->border_width;
 
   if (GTK_WIDGET_REALIZED (widget))