gtk+ r19640 - in branches/gtk-2-12: . gdk/quartz

[rhult svn gnome org]

Author: rhult
Date: Sun Feb 24 18:00:43 2008
New Revision: 19640
URL: http://svn.gnome.org/viewvc/gtk+?rev=19640&view=rev

Log:
2008-02-24  Richard Hult  <richard imendio com>

	Merged from trunk:

	* gdk/quartz/GdkQuartzWindow.c: Prevent hidden windows from being
	shown without gdk's control when clicking the dock icon.


Modified:
   branches/gtk-2-12/ChangeLog
   branches/gtk-2-12/gdk/quartz/GdkQuartzWindow.c

Modified: branches/gtk-2-12/gdk/quartz/GdkQuartzWindow.c
==============================================================================
--- branches/gtk-2-12/gdk/quartz/GdkQuartzWindow.c	(original)
+++ branches/gtk-2-12/gdk/quartz/GdkQuartzWindow.c	Sun Feb 24 18:00:43 2008
@@ -79,9 +79,18 @@
 
 -(void)windowDidBecomeMain:(NSNotification *)aNotification
 {
-  GdkWindow *window;
+  GdkWindow *window = [[self contentView] gdkWindow];
+
+  if (![self isVisible])
+    {
+      /* Note: This is a hack needed because for unknown reasons, hidden
+       * windows get shown when clicking the dock icon when the application
+       * is not already active.
+       */
+      [self orderOut:nil];
+      return;
+    }
 
-  window = [[self contentView] gdkWindow];
   _gdk_quartz_window_did_become_main (window);
 }