From 3337ee8fa2fde7db58f4fe60ac55caad2189e4fa Mon Sep 17 00:00:00 2001 From: Richard Hult Date: Mon, 4 Jun 2007 21:25:42 +0000 Subject: [PATCH] Don't try to make temp windows key windows, fixes problem introduced 2007-06-04 Richard Hult * 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 --- ChangeLog | 12 +++++++++--- gdk/quartz/gdkwindow-quartz.c | 5 +++-- 2 files changed, 12 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index 554d1b5155..d380de467d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,8 +1,14 @@ 2007-06-04 Richard Hult - * 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 + + * 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 diff --git a/gdk/quartz/gdkwindow-quartz.c b/gdk/quartz/gdkwindow-quartz.c index fd01805f41..e7c066a02c 100644 --- a/gdk/quartz/gdkwindow-quartz.c +++ b/gdk/quartz/gdkwindow-quartz.c @@ -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];