diff --git a/ChangeLog b/ChangeLog index 4c965724c0..31dc9ae342 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Sun Aug 2 03:08:07 1998 Owen Taylor + + * gdk/gdkwindow.c (gdk_window_reparent): Change + window_private->parent pointer when reparenting. + Sat Aug 1 22:17:00 1998 Raph Levien * gdk/gdkrgb.c: made some minor config changes to unify GdkRgb @@ -170,6 +175,7 @@ Fri, 24 Jul 1998 10:56:22 +0200 Paolo Molaro * gtk/gtkfeatures.h.in: added GTK_HAVE_ENUM_VALUE_STRUCT. +>>>>>>> 1.560 Thu Jul 23 00:11:39 1998 Tim Janik * gtk/testgtkrc: introduce testbindings on C-1 for buttons, diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0 index 4c965724c0..31dc9ae342 100644 --- a/ChangeLog.pre-2-0 +++ b/ChangeLog.pre-2-0 @@ -1,3 +1,8 @@ +Sun Aug 2 03:08:07 1998 Owen Taylor + + * gdk/gdkwindow.c (gdk_window_reparent): Change + window_private->parent pointer when reparenting. + Sat Aug 1 22:17:00 1998 Raph Levien * gdk/gdkrgb.c: made some minor config changes to unify GdkRgb @@ -170,6 +175,7 @@ Fri, 24 Jul 1998 10:56:22 +0200 Paolo Molaro * gtk/gtkfeatures.h.in: added GTK_HAVE_ENUM_VALUE_STRUCT. +>>>>>>> 1.560 Thu Jul 23 00:11:39 1998 Tim Janik * gtk/testgtkrc: introduce testbindings on C-1 for buttons, diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 4c965724c0..31dc9ae342 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,8 @@ +Sun Aug 2 03:08:07 1998 Owen Taylor + + * gdk/gdkwindow.c (gdk_window_reparent): Change + window_private->parent pointer when reparenting. + Sat Aug 1 22:17:00 1998 Raph Levien * gdk/gdkrgb.c: made some minor config changes to unify GdkRgb @@ -170,6 +175,7 @@ Fri, 24 Jul 1998 10:56:22 +0200 Paolo Molaro * gtk/gtkfeatures.h.in: added GTK_HAVE_ENUM_VALUE_STRUCT. +>>>>>>> 1.560 Thu Jul 23 00:11:39 1998 Tim Janik * gtk/testgtkrc: introduce testbindings on C-1 for buttons, diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2 index 4c965724c0..31dc9ae342 100644 --- a/ChangeLog.pre-2-2 +++ b/ChangeLog.pre-2-2 @@ -1,3 +1,8 @@ +Sun Aug 2 03:08:07 1998 Owen Taylor + + * gdk/gdkwindow.c (gdk_window_reparent): Change + window_private->parent pointer when reparenting. + Sat Aug 1 22:17:00 1998 Raph Levien * gdk/gdkrgb.c: made some minor config changes to unify GdkRgb @@ -170,6 +175,7 @@ Fri, 24 Jul 1998 10:56:22 +0200 Paolo Molaro * gtk/gtkfeatures.h.in: added GTK_HAVE_ENUM_VALUE_STRUCT. +>>>>>>> 1.560 Thu Jul 23 00:11:39 1998 Tim Janik * gtk/testgtkrc: introduce testbindings on C-1 for buttons, diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index 4c965724c0..31dc9ae342 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,8 @@ +Sun Aug 2 03:08:07 1998 Owen Taylor + + * gdk/gdkwindow.c (gdk_window_reparent): Change + window_private->parent pointer when reparenting. + Sat Aug 1 22:17:00 1998 Raph Levien * gdk/gdkrgb.c: made some minor config changes to unify GdkRgb @@ -170,6 +175,7 @@ Fri, 24 Jul 1998 10:56:22 +0200 Paolo Molaro * gtk/gtkfeatures.h.in: added GTK_HAVE_ENUM_VALUE_STRUCT. +>>>>>>> 1.560 Thu Jul 23 00:11:39 1998 Tim Janik * gtk/testgtkrc: introduce testbindings on C-1 for buttons, diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index 4c965724c0..31dc9ae342 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,8 @@ +Sun Aug 2 03:08:07 1998 Owen Taylor + + * gdk/gdkwindow.c (gdk_window_reparent): Change + window_private->parent pointer when reparenting. + Sat Aug 1 22:17:00 1998 Raph Levien * gdk/gdkrgb.c: made some minor config changes to unify GdkRgb @@ -170,6 +175,7 @@ Fri, 24 Jul 1998 10:56:22 +0200 Paolo Molaro * gtk/gtkfeatures.h.in: added GTK_HAVE_ENUM_VALUE_STRUCT. +>>>>>>> 1.560 Thu Jul 23 00:11:39 1998 Tim Janik * gtk/testgtkrc: introduce testbindings on C-1 for buttons, diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 4c965724c0..31dc9ae342 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,8 @@ +Sun Aug 2 03:08:07 1998 Owen Taylor + + * gdk/gdkwindow.c (gdk_window_reparent): Change + window_private->parent pointer when reparenting. + Sat Aug 1 22:17:00 1998 Raph Levien * gdk/gdkrgb.c: made some minor config changes to unify GdkRgb @@ -170,6 +175,7 @@ Fri, 24 Jul 1998 10:56:22 +0200 Paolo Molaro * gtk/gtkfeatures.h.in: added GTK_HAVE_ENUM_VALUE_STRUCT. +>>>>>>> 1.560 Thu Jul 23 00:11:39 1998 Tim Janik * gtk/testgtkrc: introduce testbindings on C-1 for buttons, diff --git a/gdk/gdkwindow.c b/gdk/gdkwindow.c index cb04d61a0f..5c1feb2e3a 100644 --- a/gdk/gdkwindow.c +++ b/gdk/gdkwindow.c @@ -857,6 +857,8 @@ gdk_window_reparent (GdkWindow *window, parent_private->xwindow, x, y); + window_private->parent = new_parent; + if (old_parent_private) old_parent_private->children = g_list_remove (old_parent_private->children, window); parent_private->children = g_list_prepend (parent_private->children, window); diff --git a/gdk/x11/gdkwindow-x11.c b/gdk/x11/gdkwindow-x11.c index cb04d61a0f..5c1feb2e3a 100644 --- a/gdk/x11/gdkwindow-x11.c +++ b/gdk/x11/gdkwindow-x11.c @@ -857,6 +857,8 @@ gdk_window_reparent (GdkWindow *window, parent_private->xwindow, x, y); + window_private->parent = new_parent; + if (old_parent_private) old_parent_private->children = g_list_remove (old_parent_private->children, window); parent_private->children = g_list_prepend (parent_private->children, window);