diff options
| author | Jan Djärv | 2013-08-13 22:18:30 +0200 |
|---|---|---|
| committer | Jan Djärv | 2013-08-13 22:18:30 +0200 |
| commit | a5bd5abb645ea5c0e5bb45425128166af44dc237 (patch) | |
| tree | 1106c775c17637a8b89b4750cda453afb526ee66 | |
| parent | c6b7ccaaf6f50828eb17bab5826a0fd203251dd2 (diff) | |
| download | emacs-a5bd5abb645ea5c0e5bb45425128166af44dc237.tar.gz emacs-a5bd5abb645ea5c0e5bb45425128166af44dc237.zip | |
Fix OSX 10.4 compiler errors.
* nsmenu.m (x_activate_menubar): Check for OSX >= 10.5
(trackingNotification:): Call ns_check_menu_open only for OSX >= 10.5.
| -rw-r--r-- | src/ChangeLog | 5 | ||||
| -rw-r--r-- | src/nsmenu.m | 4 |
2 files changed, 9 insertions, 0 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index af76a0c3780..0c0583684dc 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,3 +1,8 @@ | |||
| 1 | 2013-08-13 Jan Djärv <jan.h.d@swipnet.se> | ||
| 2 | |||
| 3 | * nsmenu.m (x_activate_menubar): Check for OSX >= 10.5 | ||
| 4 | (trackingNotification:): Call ns_check_menu_open only for OSX >= 10.5. | ||
| 5 | |||
| 1 | 2013-08-13 Lars Magne Ingebrigtsen <larsi@gnus.org> | 6 | 2013-08-13 Lars Magne Ingebrigtsen <larsi@gnus.org> |
| 2 | 7 | ||
| 3 | * image.c (imagemagick_filename_hint): Check for errors in the | 8 | * image.c (imagemagick_filename_hint): Check for errors in the |
diff --git a/src/nsmenu.m b/src/nsmenu.m index 2850f0ed97d..3266d76450c 100644 --- a/src/nsmenu.m +++ b/src/nsmenu.m | |||
| @@ -504,9 +504,11 @@ void | |||
| 504 | x_activate_menubar (struct frame *f) | 504 | x_activate_menubar (struct frame *f) |
| 505 | { | 505 | { |
| 506 | #ifdef NS_IMPL_COCOA | 506 | #ifdef NS_IMPL_COCOA |
| 507 | #if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_5 | ||
| 507 | ns_update_menubar (f, true, nil); | 508 | ns_update_menubar (f, true, nil); |
| 508 | ns_check_pending_open_menu (); | 509 | ns_check_pending_open_menu (); |
| 509 | #endif | 510 | #endif |
| 511 | #endif | ||
| 510 | } | 512 | } |
| 511 | 513 | ||
| 512 | 514 | ||
| @@ -563,7 +565,9 @@ extern NSString *NSMenuDidBeginTrackingNotification; | |||
| 563 | /* Update menu in menuNeedsUpdate only while tracking menus. */ | 565 | /* Update menu in menuNeedsUpdate only while tracking menus. */ |
| 564 | trackingMenu = ([notification name] == NSMenuDidBeginTrackingNotification | 566 | trackingMenu = ([notification name] == NSMenuDidBeginTrackingNotification |
| 565 | ? 1 : 0); | 567 | ? 1 : 0); |
| 568 | #if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_5 | ||
| 566 | if (! trackingMenu) ns_check_menu_open (nil); | 569 | if (! trackingMenu) ns_check_menu_open (nil); |
| 570 | #endif | ||
| 567 | } | 571 | } |
| 568 | 572 | ||
| 569 | #if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_5 | 573 | #if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_5 |