Removed code for drawing the child in two places at once. Unfortunately,

Fri Jun 12 21:20:42 1998  Owen Taylor  <otaylor@gtk.org>

	* gtk/gtkoptionmenu.c (gtk_option_menu_expose): Removed
	code for drawing the child in two places at once. Unfortunately,
	not only does it not work anymore (because reparenting has
	been fixed), but it also triggers reparent/expose loops
	in some cases.

	* gtk/gtkoptionmenu.c (gtk_option_menu_remove_contents): Removed
	an unecessary unrealize.
This commit is contained in:
Owen Taylor
1998-06-13 01:36:28 +00:00
committed by Owen Taylor
parent 1dc1b050b2
commit 92270f8620
10 changed files with 144 additions and 1 deletions

View File

@ -816,6 +816,7 @@ gdk_window_reparent (GdkWindow *window,
{
GdkWindowPrivate *window_private;
GdkWindowPrivate *parent_private;
GdkWindowPrivate *old_parent_private;
g_return_if_fail (window != NULL);
@ -823,6 +824,7 @@ gdk_window_reparent (GdkWindow *window,
new_parent = (GdkWindow*) &gdk_root_parent;
window_private = (GdkWindowPrivate*) window;
old_parent_private = (GdkWindowPrivate*)window_private->parent;
parent_private = (GdkWindowPrivate*) new_parent;
if (!window_private->destroyed && !parent_private->destroyed)
@ -830,6 +832,10 @@ gdk_window_reparent (GdkWindow *window,
window_private->xwindow,
parent_private->xwindow,
x, y);
old_parent_private->children = g_list_remove (old_parent_private->children, window);
parent_private->children = g_list_prepend (parent_private->children, window);
}
void