diff options
| author | Alan Third <alan@idiocy.org> | 2016-07-07 20:42:11 +0100 |
|---|---|---|
| committer | Alan Third <alan@idiocy.org> | 2016-07-07 20:48:35 +0100 |
| commit | 5508f06f3283b4129cd70340a58ba608cc810d4e (patch) | |
| tree | d0968298b39e819e6364b2032a4a6a5bf21b296f | |
| parent | 42ac8f5723a6a1e70cca39d08c222f595828d34d (diff) | |
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.
| -rw-r--r-- | src/nsmenu.m | 6 | ||||
| -rw-r--r-- | src/nsterm.m | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/src/nsmenu.m b/src/nsmenu.m index 7d340e8ec8..10dfe8aac1 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 4027f5c461..bd477a491f 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; } |