Fix up merge slipup.

Mon Mar 27 20:56:14 2000  Owen Taylor  <otaylor@redhat.com>

	* gtk/gtkwidget.c (gtk_widget_queue_clear_area): Fix up
	merge slipup.

	* gdk/gdkinput.h: Fix missing line from merge.

1 files changed, 1 insertions, 23 deletions

diff --git a/gtk/gtkwidget.c b/gtk/gtkwidget.c
index 88d6d13e7..62127f727 100644
--- a/gtk/gtkwidget.c
+++ b/gtk/gtkwidget.c
@@ -1749,29 +1749,7 @@ gtk_widget_queue_clear_area (GtkWidget *widget,
 
   /* Find the correct widget */
 
-  if (GTK_WIDGET_NO_WINDOW (widget))
-    {
-      /* The following deals with the fact that while we are in
-       * a reparent, the widget and window heirarchies
-       * may be different, and the redraw queing code will be utterly
-       * screwed by that. 
-       *
-       * So, continuing at this point is a bad idea, and returning is
-       * generally harmless. (More redraws will be queued then necessary
-       * for a reparent in any case.) This can go away, when we
-       * make reparent simply ref/remove/add/unref.
-       */
-      if (GTK_WIDGET_IN_REPARENT (widget))
-	return;
-
-      parent = widget;
-      while (parent && GTK_WIDGET_NO_WINDOW (parent))
-	parent = parent->parent;
-      
-      if (parent)
-	gtk_widget_queue_draw_data (parent, x, y, width, height, widget->window);
-    }
-  else
+  if (!GTK_WIDGET_NO_WINDOW (widget))
     {
       if (widget->parent)
 	{