diff options
| author | Jan Djärv <jan.h.d@swipnet.se> | 2012-07-31 18:19:03 +0200 |
|---|---|---|
| committer | Jan Djärv <jan.h.d@swipnet.se> | 2012-07-31 18:19:03 +0200 |
| commit | 79e721e0f886f048bafd46e8dec6630e035e6ed4 (patch) | |
| tree | 1d633c08a4d52e9bd53833c1575ab9fa5b777138 /src/nsmenu.m | |
| parent | f1310128a0fc933830436ceb51bd6293d14d3f25 (diff) | |
| download | emacs-79e721e0f886f048bafd46e8dec6630e035e6ed4.tar.gz | |
Fix compiler and run time warnings in nsmenu.m and nsterm.m
* nsfns.m, nsmenu.m, msterm.m: Adopt to struct frame/FVAR changes.
* nsmenu.m (update_frame_tool_bar): Change key from NSObject* to id.
* nsterm.m (ns_draw_fringe_bitmap, ns_dumpglyphs_image): Use drawInRect
instead of compositeToPoint.
(applicationShouldTerminate): Pass NS String literal to NSRunAlertPanel.
Diffstat (limited to 'src/nsmenu.m')
| -rw-r--r-- | src/nsmenu.m | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/nsmenu.m b/src/nsmenu.m index 61c4bd1e893..86ffeec2952 100644 --- a/src/nsmenu.m +++ b/src/nsmenu.m @@ -1102,7 +1102,7 @@ update_frame_tool_bar (FRAME_PTR f) NSDictionary *dict = [toolbar configurationDictionary]; NSMutableDictionary *newDict = [dict mutableCopy]; NSEnumerator *keys = [[dict allKeys] objectEnumerator]; - NSObject *key; + id key; while ((key = [keys nextObject]) != nil) { NSObject *val = [dict objectForKey: key]; |