[Emacs-diffs] master 762be77 08/13: Nextstep: remove some deprecated method calls

[Philipp Stephani]

branch: master
commit 762be778fcb55bc56286d3abc1bd92a3331423d9
Author: Philipp Stephani <address@hidden>
Commit: Philipp Stephani <address@hidden>

    Nextstep: remove some deprecated method calls
    
    * src/nsterm.m (mouseDown:):
    * src/nsmenu.m (runMenuAt:forFrame:keymaps:): Remove call to
    deprecated method.  The return value is always nil.
    * src/macfont.m (mac_font_shape_1): Replace call to deprecated method.
---
 src/macfont.m | 5 +++--
 src/nsmenu.m  | 2 +-
 src/nsterm.m  | 2 +-
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/macfont.m b/src/macfont.m
index dccb4e6..be81533 100644
--- a/src/macfont.m
+++ b/src/macfont.m
@@ -410,8 +410,9 @@ mac_font_shape_1 (NSFont *font, NSString *string,
       /* For now we assume the direction is not changed within the
          string.  */
       [layoutManager getGlyphsInRange:(NSMakeRange (glyphIndex, 1))
-                               glyphs:NULL characterIndexes:NULL
-                    glyphInscriptions:NULL elasticBits:NULL
+                               glyphs:NULL
+                           properties:NULL
+                     characterIndexes:NULL
                            bidiLevels:&bidiLevel];
       if (bidiLevel & 1)
         permutation = xmalloc (sizeof (NSUInteger) * used);
diff --git a/src/nsmenu.m b/src/nsmenu.m
index 5e863bb..8dcbe19 100644
--- a/src/nsmenu.m
+++ b/src/nsmenu.m
@@ -750,7 +750,7 @@ x_activate_menubar (struct frame *f)
                          modifierFlags: 0
                              timestamp: [e timestamp]
                           windowNumber: [[view window] windowNumber]
-                               context: [e context]
+                               context: nil
                            eventNumber: 0/*[e eventNumber] */
                             clickCount: 1
                               pressure: 0];
diff --git a/src/nsterm.m b/src/nsterm.m
index 785147a..8b0c3cf 100644
--- a/src/nsterm.m
+++ b/src/nsterm.m
@@ -8602,7 +8602,7 @@ not_in_argv (NSString *arg)
                                  modifierFlags: [e modifierFlags]
                                      timestamp: [e timestamp]
                                   windowNumber: [e windowNumber]
-                                       context: [e context]
+                                       context: nil
                                    eventNumber: [e eventNumber]
                                     clickCount: [e clickCount]
                                       pressure: [e pressure]];