Commit 526fecc2 authored by Richard Hult's avatar Richard Hult Committed by Richard Hult

Defer setting the parent until the window is shown, otherwise it gets

2007-06-16  Richard Hult  <richard@imendio.com>

	* gdk/quartz/gdkwindow-quartz.c: (gdk_window_set_transient_for):
	Defer setting the parent until the window is shown, otherwise it
	gets unconditionally shown here.

svn path=/trunk/; revision=18164
parent d0794b1c
2007-06-16 Richard Hult <richard@imendio.com>
* gdk/quartz/gdkwindow-quartz.c: (gdk_window_set_transient_for):
Defer setting the parent until the window is shown, otherwise it
gets unconditionally shown here.
2007-06-16 Johan Dahlin <jdahlin@async.com.br>
* gtk/gtkbuilderparser.c (text): Swap argument order to dgettext
......
......@@ -1585,7 +1585,13 @@ gdk_window_set_transient_for (GdkWindow *window,
if (gdk_window_get_type_hint (window) != GDK_WINDOW_TYPE_HINT_TOOLTIP)
{
window_impl->transient_for = g_object_ref (parent);
[parent_impl->toplevel addChildWindow:window_impl->toplevel ordered:NSWindowAbove];
/* We only add the window if it is shown, otherwise it will
* be shown unconditionally here. If it is not shown, the
* window will be added in show() instead.
*/
if (!(GDK_WINDOW_OBJECT (window)->state & GDK_WINDOW_STATE_WITHDRAWN))
[parent_impl->toplevel addChildWindow:window_impl->toplevel ordered:NSWindowAbove];
}
}
......
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