AuroraMiddleware/gtk2
1
0
Fork 0
forked from AuroraMiddleware/gtk
Code Issues Pull Requests Projects Releases Wiki Activity

Fix up merge slipup.

Browse Source 
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.
This commit is contained in:
Owen Taylor 2000-03-28 01:58:05 +00:00 committed by Owen Taylor
parent b14b577d59
commit a6e85956d2
10 changed files with 58 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
ChangeLog
View File

@ -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>

9
ChangeLog.pre-2-0
View File

@ -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>

9
ChangeLog.pre-2-10
View File

@ -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>

9
ChangeLog.pre-2-2
View File

@ -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>

9
ChangeLog.pre-2-4
View File

@ -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>

9
ChangeLog.pre-2-6
View File

@ -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>

9
ChangeLog.pre-2-8
View File

@ -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>

1
gdk/gdkinput.h
View File

@ -99,6 +99,7 @@ GdkTimeCoord *gdk_input_motion_events (GdkWindow *window,
guint32 deviceid,
guint32 start,
guint32 stop,
gint *nevents_return);
#ifdef __cplusplus
}

1
gdk/gdktypes.h
View File

@ -163,7 +163,6 @@ struct _GdkSegment
gint y2;
};
#ifdef __cplusplus
}
#endif /* __cplusplus */

24
gtk/gtkwidget.c
View File

@ -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)
{