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.

10 files changed, 58 insertions, 31 deletions

diff --git a/ChangeLog b/ChangeLog
index cdc97adc12..723938d998 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,7 +1,14 @@
+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.
+
 Mon Mar 27 20:39:49 2000  Owen Taylor  <otaylor@redhat.com>
 
 	* gdk/gdkcolor.c cursor.c gdkdraw.c gdkfont.c: Include gdkinternals.h
-	instead of gdkprivate.h
+	instead of gdkprivate.h.
 
 Sun Mar 12 15:19:24 2000  Owen Taylor  <otaylor@redhat.com>
 
diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0
index cdc97adc12..723938d998 100644
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -1,7 +1,14 @@
+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.
+
 Mon Mar 27 20:39:49 2000  Owen Taylor  <otaylor@redhat.com>
 
 	* gdk/gdkcolor.c cursor.c gdkdraw.c gdkfont.c: Include gdkinternals.h
-	instead of gdkprivate.h
+	instead of gdkprivate.h.
 
 Sun Mar 12 15:19:24 2000  Owen Taylor  <otaylor@redhat.com>
 
diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index cdc97adc12..723938d998 100644
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,7 +1,14 @@
+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.
+
 Mon Mar 27 20:39:49 2000  Owen Taylor  <otaylor@redhat.com>
 
 	* gdk/gdkcolor.c cursor.c gdkdraw.c gdkfont.c: Include gdkinternals.h
-	instead of gdkprivate.h
+	instead of gdkprivate.h.
 
 Sun Mar 12 15:19:24 2000  Owen Taylor  <otaylor@redhat.com>
 
diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index cdc97adc12..723938d998 100644
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,7 +1,14 @@
+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.
+
 Mon Mar 27 20:39:49 2000  Owen Taylor  <otaylor@redhat.com>
 
 	* gdk/gdkcolor.c cursor.c gdkdraw.c gdkfont.c: Include gdkinternals.h
-	instead of gdkprivate.h
+	instead of gdkprivate.h.
 
 Sun Mar 12 15:19:24 2000  Owen Taylor  <otaylor@redhat.com>
 
diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index cdc97adc12..723938d998 100644
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,7 +1,14 @@
+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.
+
 Mon Mar 27 20:39:49 2000  Owen Taylor  <otaylor@redhat.com>
 
 	* gdk/gdkcolor.c cursor.c gdkdraw.c gdkfont.c: Include gdkinternals.h
-	instead of gdkprivate.h
+	instead of gdkprivate.h.
 
 Sun Mar 12 15:19:24 2000  Owen Taylor  <otaylor@redhat.com>
 
diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index cdc97adc12..723938d998 100644
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,7 +1,14 @@
+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.
+
 Mon Mar 27 20:39:49 2000  Owen Taylor  <otaylor@redhat.com>
 
 	* gdk/gdkcolor.c cursor.c gdkdraw.c gdkfont.c: Include gdkinternals.h
-	instead of gdkprivate.h
+	instead of gdkprivate.h.
 
 Sun Mar 12 15:19:24 2000  Owen Taylor  <otaylor@redhat.com>
 
diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index cdc97adc12..723938d998 100644
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,7 +1,14 @@
+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.
+
 Mon Mar 27 20:39:49 2000  Owen Taylor  <otaylor@redhat.com>
 
 	* gdk/gdkcolor.c cursor.c gdkdraw.c gdkfont.c: Include gdkinternals.h
-	instead of gdkprivate.h
+	instead of gdkprivate.h.
 
 Sun Mar 12 15:19:24 2000  Owen Taylor  <otaylor@redhat.com>
 
diff --git a/gdk/gdkinput.h b/gdk/gdkinput.h
index db23b3f6d5..35550b2655 100644
--- a/gdk/gdkinput.h
+++ b/gdk/gdkinput.h
@@ -99,6 +99,7 @@ GdkTimeCoord *gdk_input_motion_events        (GdkWindow        *window,
 					      guint32           deviceid,
 					      guint32           start,
 					      guint32           stop,
+					      gint             *nevents_return);
 
 #ifdef __cplusplus
 }
diff --git a/gdk/gdktypes.h b/gdk/gdktypes.h
index 3ba5abf1dc..900339b68d 100644
--- a/gdk/gdktypes.h
+++ b/gdk/gdktypes.h
@@ -163,7 +163,6 @@ struct _GdkSegment
   gint y2;
 };
 
-
 #ifdef __cplusplus
 }
 #endif /* __cplusplus */
diff --git a/gtk/gtkwidget.c b/gtk/gtkwidget.c
index 88d6d13e75..62127f727c 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)
 	{