gtk+ r21618 - in branches/gtk-2-14: . gdk/quartz

[rhult svn gnome org]

Author: rhult
Date: Thu Oct  9 11:30:10 2008
New Revision: 21618
URL: http://svn.gnome.org/viewvc/gtk+?rev=21618&view=rev

Log:
2008-10-09  Richard Hult  <richard imendio com>

	Merged from trunk:

	Bug 550342 â Splash screens have a caption

	* gdk/quartz/gdkwindow-quartz.c: (_gdk_window_new),
	(gdk_window_set_decorations): Patch from Marianne Gagnon to make
	splash windows borderless.


Modified:
   branches/gtk-2-14/ChangeLog
   branches/gtk-2-14/gdk/quartz/gdkwindow-quartz.c

Modified: branches/gtk-2-14/gdk/quartz/gdkwindow-quartz.c
==============================================================================
--- branches/gtk-2-14/gdk/quartz/gdkwindow-quartz.c	(original)
+++ branches/gtk-2-14/gdk/quartz/gdkwindow-quartz.c	Thu Oct  9 11:30:10 2008
@@ -1016,12 +1016,13 @@
         content_rect = NSMakeRect (-500 - impl->width, -500 - impl->height,
                                    impl->width, impl->height);
 
-	switch (attributes->window_type) 
+        if (attributes->window_type == GDK_WINDOW_TEMP ||
+            attributes->type_hint == GDK_WINDOW_TYPE_HINT_SPLASHSCREEN)
           {
-          case GDK_WINDOW_TEMP:
             style_mask = NSBorderlessWindowMask;
-            break;
-          default:
+          }
+        else
+          {
             style_mask = (NSTitledWindowMask |
                           NSClosableWindowMask |
                           NSMiniaturizableWindowMask |
@@ -2733,7 +2734,8 @@
 
   impl = GDK_WINDOW_IMPL_QUARTZ (GDK_WINDOW_OBJECT (window)->impl);
 
-  if (decorations == 0 || GDK_WINDOW_TYPE (window) == GDK_WINDOW_TEMP)
+  if (decorations == 0 || GDK_WINDOW_TYPE (window) == GDK_WINDOW_TEMP ||
+      impl->type_hint == GDK_WINDOW_TYPE_HINT_SPLASHSCREEN )
     {
       new_mask = NSBorderlessWindowMask;
     }