Commit a6e85956 authored by Owen Taylor's avatar Owen Taylor Committed by Owen Taylor

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.
parent b14b577d
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>
......
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>
......
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>
......
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>
......
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>
......
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>
......
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>
......
......@@ -99,6 +99,7 @@ GdkTimeCoord *gdk_input_motion_events (GdkWindow *window,
guint32 deviceid,
guint32 start,
guint32 stop,
gint *nevents_return);
#ifdef __cplusplus
}
......
......@@ -163,7 +163,6 @@ struct _GdkSegment
gint y2;
};
#ifdef __cplusplus
}
#endif /* __cplusplus */
......
......@@ -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)
{
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment