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

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

Browse Source 
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
This commit is contained in:
Richard Hult 2007-06-16 21:21:52 +00:00 committed by Richard Hult
parent d0794b1ce2
commit 526fecc2f9
2 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -1,3 +1,9 @@
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

8
gdk/quartz/gdkwindow-quartz.c
View File

@ -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];
}
}