diff options
| author | Jan Djärv | 2011-07-23 10:33:06 +0200 |
|---|---|---|
| committer | Jan Djärv | 2011-07-23 10:33:06 +0200 |
| commit | a258d62771e02f425e93886428a768424062076f (patch) | |
| tree | 1ea489f9d7d57df600ea0fa5af6e61b8156c726f /src | |
| parent | 0f74f7850de124626d556442d22d143d85457816 (diff) | |
| download | emacs-a258d62771e02f425e93886428a768424062076f.tar.gz emacs-a258d62771e02f425e93886428a768424062076f.zip | |
Fix title and toolbar not shown in OSX 10.7.
* nsterm.m (initFrameFromEmacs): Set NSTitledWindowMask in styleMask
for OSX >= 10.7.
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 5 | ||||
| -rw-r--r-- | src/nsterm.m | 3 |
2 files changed, 8 insertions, 0 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index ef60506e724..9b66b8f34ff 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,3 +1,8 @@ | |||
| 1 | 2011-07-23 Jan Djärv <jan.h.d@swipnet.se> | ||
| 2 | |||
| 3 | * nsterm.m (initFrameFromEmacs): Set NSTitledWindowMask in styleMask | ||
| 4 | for OSX >= 10.7. | ||
| 5 | |||
| 1 | 2011-07-22 Eli Zaretskii <eliz@gnu.org> | 6 | 2011-07-22 Eli Zaretskii <eliz@gnu.org> |
| 2 | 7 | ||
| 3 | Fix a significant slow-down of cursor motion with C-n, C-p, | 8 | 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) | |||
| 5304 | win = [[EmacsWindow alloc] | 5304 | win = [[EmacsWindow alloc] |
| 5305 | initWithContentRect: r | 5305 | initWithContentRect: r |
| 5306 | styleMask: (NSResizableWindowMask | | 5306 | styleMask: (NSResizableWindowMask | |
| 5307 | #if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_7 | ||
| 5308 | NSTitledWindowMask | | ||
| 5309 | #endif | ||
| 5307 | NSMiniaturizableWindowMask | | 5310 | NSMiniaturizableWindowMask | |
| 5308 | NSClosableWindowMask) | 5311 | NSClosableWindowMask) |
| 5309 | backing: NSBackingStoreBuffered | 5312 | backing: NSBackingStoreBuffered |