summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRichard Hult <richard@imendio.com>2007-06-06 08:21:14 +0000
committerRichard Hult <rhult@src.gnome.org>2007-06-06 08:21:14 +0000
commit949a86729de01be63818a5d4b4b33ee563b8883f (patch)
tree24eac66a59fd776b0cf52b5957e40af0fc72e48b
parentc62db99be28a4c1b05fd078c7b8c42e35a945b6b (diff)
downloadgdk-pixbuf-949a86729de01be63818a5d4b4b33ee563b8883f.tar.gz
Don't let temp windows become key window.
2007-06-05 Richard Hult <richard@imendio.com> * gdk/quartz/GdkQuartzWindow.c: Don't let temp windows become key window. svn path=/trunk/; revision=18046
-rw-r--r--ChangeLog5
-rw-r--r--gdk/quartz/GdkQuartzWindow.c8
2 files changed, 8 insertions, 5 deletions
diff --git a/ChangeLog b/ChangeLog
index fc524905d..c136d8283 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2007-06-05 Richard Hult <richard@imendio.com>
+
+ * gdk/quartz/GdkQuartzWindow.c: Don't let temp windows become key
+ window.
+
2007-06-06 Tor Lillqvist <tml@novell.com>
* gdk/x11/gdkwindow-x11.c (gdk_window_set_opacity): Fix
diff --git a/gdk/quartz/GdkQuartzWindow.c b/gdk/quartz/GdkQuartzWindow.c
index 04fb48915..9a97ec4ae 100644
--- a/gdk/quartz/GdkQuartzWindow.c
+++ b/gdk/quartz/GdkQuartzWindow.c
@@ -179,13 +179,11 @@
if (!private->accept_focus)
return NO;
- /* FIXME: Is this right? If so, the switch shouldn't be needed. Need
- * this + some tweaking to the event/grab code to get menus
- * working...
+ /* Popup windows should not be able to get focused in the window
+ * manager sense, it's only handled through grabs.
*/
- /*if (private->window_type == GDK_WINDOW_TEMP)
+ if (private->window_type == GDK_WINDOW_TEMP)
return NO;
- */
switch (impl->type_hint)
{