emacs-diffs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Emacs-diffs] master 5508f06: Fix some deprecated functions


From: Alan Third
Subject: [Emacs-diffs] master 5508f06: Fix some deprecated functions
Date: Thu, 7 Jul 2016 19:48:54 +0000 (UTC)

branch: master
commit 5508f06f3283b4129cd70340a58ba608cc810d4e
Author: Alan Third <address@hidden>
Commit: Alan Third <address@hidden>

    Fix some deprecated functions
    
    * src/nsterm.m (firstRectForCharacterRange): In OS X >10.6 replace
    convertBaseToScreen with convertRectToScreen.
    * src/nsmenu.m (ns_update_menubar): Remove attachedMenu, deprecated in
    OS X 10.2, and always seems to return nil.
---
 src/nsmenu.m |    6 ------
 src/nsterm.m |    6 ++++++
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/nsmenu.m b/src/nsmenu.m
index 7d340e8..10dfe8a 100644
--- a/src/nsmenu.m
+++ b/src/nsmenu.m
@@ -136,12 +136,6 @@ ns_update_menubar (struct frame *f, bool deep_p, EmacsMenu 
*submenu)
       menu = [[EmacsMenu alloc] initWithTitle: ns_app_name];
       needsSet = YES;
     }
-  else
-    {  /* close up anything on there */
-      id attMenu = [menu attachedMenu];
-      if (attMenu != nil)
-        [attMenu close];
-    }
 
 #if NSMENUPROFILE
   ftime (&tb);
diff --git a/src/nsterm.m b/src/nsterm.m
index 4027f5c..bd477a4 100644
--- a/src/nsterm.m
+++ b/src/nsterm.m
@@ -6191,8 +6191,14 @@ not_in_argv (NSString *arg)
                                        +FRAME_LINE_HEIGHT (emacsframe));
 
   pt = [self convertPoint: pt toView: nil];
+#if !defined (NS_IMPL_COCOA) || \
+  MAC_OS_X_VERSION_MAX_ALLOWED < MAC_OS_X_VERSION_10_7
   pt = [[self window] convertBaseToScreen: pt];
   rect.origin = pt;
+#else
+  rect.origin = pt;
+  rect = [[self window] convertRectToScreen: rect];
+#endif
   return rect;
 }
 



reply via email to

[Prev in Thread] Current Thread [Next in Thread]