Don't try to make temp windows key windows, fixes problem introduced

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

	* gdk/quartz/gdkwindow-quartz.c:
	(show_window_internal): Don't try to make temp windows key
	windows, fixes problem introduced below.

svn path=/trunk/; revision=18040
This commit is contained in:
Richard Hult
2007-06-04 21:25:42 +00:00
committed by Richard Hult
parent eede6a2cc7
commit 3337ee8fa2
2 changed files with 12 additions and 5 deletions

View File

@@ -1,8 +1,14 @@
2007-06-04 Richard Hult <richard@imendio.com>
* gdk/quartz/GdkQuartzWindow.c: * gdk/quartz/gdkwindow-quartz.c:
Implement simple versions of gdk_window_set_accept_focus and
gdk_window_set_focus_on_map.
* gdk/quartz/gdkwindow-quartz.c:
(show_window_internal): Don't try to make temp windows key
windows, fixes problem introduced below.
2007-06-04 Richard Hult <richard@imendio.com>
* gdk/quartz/GdkQuartzWindow.c:
* gdk/quartz/gdkwindow-quartz.c: Implement simple versions of
gdk_window_set_accept_focus and gdk_window_set_focus_on_map.
2007-06-04 Richard Hult <richard@imendio.com>

View File

@@ -813,8 +813,9 @@ show_window_internal (GdkWindow *window,
/* We should make the window not raise for !raise, but at least
* this will keep it from getting focused in that case.
*/
if (private->accept_focus && focus_on_map && raise)
[impl->toplevel makeKeyAndOrderFront:nil];
if (private->accept_focus && focus_on_map && raise &&
private->window_type != GDK_WINDOW_TEMP)
[impl->toplevel makeKeyAndOrderFront:impl->toplevel];
else
[impl->toplevel orderFront:nil];