From: Jan Djärv <jan.h.d@swipnet.se>
Date: Sat, 23 Jul 2011 08:33:06 +0000 (+0200)
Subject: Fix title and toolbar not shown in OSX 10.7.
X-Git-Tag: emacs-pretest-24.0.90~104^2~174
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=a258d62771e02f425e93886428a768424062076f;p=emacs.git

Fix title and toolbar not shown in OSX 10.7.

* nsterm.m (initFrameFromEmacs): Set NSTitledWindowMask in styleMask
for OSX >= 10.7.
---

diff --git a/src/ChangeLog b/src/ChangeLog
index ef60506e724..9b66b8f34ff 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2011-07-23  Jan Djärv  <jan.h.d@swipnet.se>
+
+	* nsterm.m (initFrameFromEmacs): Set NSTitledWindowMask in styleMask
+	for OSX >= 10.7.
+
 2011-07-22  Eli Zaretskii  <eliz@gnu.org>
 
 	Fix a significant slow-down of cursor motion with C-n, C-p,
diff --git a/src/nsterm.m b/src/nsterm.m
index 546247ab74a..e45dc1a902d 100644
--- a/src/nsterm.m
+++ b/src/nsterm.m
@@ -5304,6 +5304,9 @@ ns_term_shutdown (int sig)
   win = [[EmacsWindow alloc]
             initWithContentRect: r
                       styleMask: (NSResizableWindowMask |
+#if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_7
+                                  NSTitledWindowMask |
+#endif
                                   NSMiniaturizableWindowMask |
                                   NSClosableWindowMask)
                         backing: NSBackingStoreBuffered