* nsterm.h (EmacsApp-setAppleMenu:): Conditionalize more correctly on Tiger. * nsfns...

diff --git a/src/ChangeLog b/src/ChangeLog
index 90e83f036679267df8d54bde617c2e504411b464..aed15a171fc3cfe1bfa27a3106b2f135056f07ff 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,10 @@
+2009-01-21  Adrian Robert  <Adrian.B.Robert@gmail.com>
+
+       * nsterm.h (EmacsApp-setAppleMenu:): Conditionalize more correctly on
+       Tiger.
+       * nsfns.m (ns_do_applescript): Conditionalize
+       typeUTF16ExternalRepresentation on Tiger.
+
 2009-01-21  Wolfgang Lux  <wolfgang.lux@gmail.com>  (tiny change)
 
        * nsterm.m (EV_TRAILER): Always use emacsframe for frame_or_window.

diff --git a/src/nsfns.m b/src/nsfns.m
index f981d44d511e5dfb94b9d0f8f3823515d0ac1439..6e1c6c05aa2863e1fd875e2e346e408c514f56f8 100644 (file)
--- a/src/nsfns.m
+++ b/src/nsfns.m
@@ -2081,8 +2081,10 @@ ns_do_applescript (script, result)
          *result = Qt;
          // script returned an AppleScript result
          if ((typeUnicodeText == [returnDescriptor descriptorType]) ||
+#if defined (NS_IMPL_COCOA) && MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_4
              (typeUTF16ExternalRepresentation 
               == [returnDescriptor descriptorType]) ||
+#endif
              (typeUTF8Text == [returnDescriptor descriptorType]) ||
              (typeCString == [returnDescriptor descriptorType]))
            {

diff --git a/src/nsterm.h b/src/nsterm.h
index 7c295edeb2d530716eb95eddd8d2b5146620d93d..351c5160fe42e9cff2e7abe403fd08d71ae52456 100644 (file)
--- a/src/nsterm.h
+++ b/src/nsterm.h
@@ -363,7 +363,7 @@ extern NSArray *ns_send_types, *ns_return_types;
 extern EmacsMenu *mainMenu, *svcsMenu, *dockMenu;
 
 /* Apple removed the declaration, but kept the implementation */
-#if defined (NS_IMPL_COCOA) && MAC_OS_X_VERSION_MIN_REQUIRED >= MAC_OS_X_VERSION_10_4
+#if defined (NS_IMPL_COCOA) && MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_4
 @interface NSApplication (EmacsApp)
 - (void)setAppleMenu: (NSMenu *)menu;
 @end