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.

diff --git a/src/macfont.m b/src/macfont.m
index dccb4e6fd020b4524b86ef18f4bdce32401c9a73..be8153390d2ac7252a3c8b55fc1a85ff4aedc6b1 100644 (file)
--- 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 5e863bb17d74a8f152536433e326676063e2f87d..8dcbe194d5740f14f45cbf3d660e88d91d690a77 100644 (file)
--- 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 785147ae8d005d9f0e5507601a3954607b40cb4d..8b0c3cf249eb0c29b1454488610478f1357acefa 100644 (file)
--- 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]];