diff options
| author | Jan D <jan.h.d@swipnet.se> | 2015-05-15 17:06:03 +0200 |
|---|---|---|
| committer | Jan D <jan.h.d@swipnet.se> | 2015-05-15 17:06:16 +0200 |
| commit | b00168e833ccca1b5c0eebe56688ec44e0efabe7 (patch) | |
| tree | 496d6cebab472c5b4a24d78194e40399f72028d0 /src/nsterm.m | |
| parent | d02ce2c4321d7b99abc2de21e01f9504008ec735 (diff) | |
| download | emacs-b00168e833ccca1b5c0eebe56688ec44e0efabe7.tar.gz | |
Fix NS warnings.
* nsmenu.m (ns_popup_dialog)
* nsimage.m (initFromXBM:width:height:fg:bg:)
* nsfns.m (Fx_create_frame): Remove unused variables.
(Fns_read_file_name): Initialize fname, remove ret.
* nsterm.m (ns_draw_window_cursor): Handle DEFAULT_CURSOR in switch.
(ns_get_color, ns_set_horizontal_scroll_bar, keyDown): Remove unused
variable.
(init): Add parantesis in if.
(ns_create_terminal): Assign set_horizontal_scroll_bar_hook.
Diffstat (limited to 'src/nsterm.m')
| -rw-r--r-- | src/nsterm.m | 23 |
1 files changed, 4 insertions, 19 deletions
diff --git a/src/nsterm.m b/src/nsterm.m index 11656a780ce..67a03898d13 100644 --- a/src/nsterm.m +++ b/src/nsterm.m @@ -1538,7 +1538,7 @@ ns_get_color (const char *name, NSColor **col) { NSColor *new = nil; static char hex[20]; - int scaling; + int scaling = 0; float r = -1.0, g, b; NSString *nsname = [NSString stringWithUTF8String: name]; @@ -2465,6 +2465,7 @@ ns_draw_window_cursor (struct window *w, struct glyph_row *glyph_row, switch (cursor_type) { + case DEFAULT_CURSOR: case NO_CURSOR: break; case FILLED_BOX_CURSOR: @@ -3963,7 +3964,6 @@ ns_set_horizontal_scroll_bar (struct window *window, EmacsScroller *bar; int top, height, left, width; int window_x, window_width; - int pixel_width = WINDOW_PIXEL_WIDTH (window); BOOL update_p = YES; /* optimization; display engine sends WAY too many of these.. */ @@ -4321,6 +4321,7 @@ ns_create_terminal (struct ns_display_info *dpyinfo) terminal->menu_show_hook = ns_menu_show; terminal->popup_dialog_hook = ns_popup_dialog; terminal->set_vertical_scroll_bar_hook = ns_set_vertical_scroll_bar; + terminal->set_horizontal_scroll_bar_hook = ns_set_horizontal_scroll_bar; terminal->condemn_scroll_bars_hook = ns_condemn_scroll_bars; terminal->redeem_scroll_bar_hook = ns_redeem_scroll_bar; terminal->judge_scroll_bars_hook = ns_judge_scroll_bars; @@ -4605,7 +4606,7 @@ ns_term_shutdown (int sig) - (id)init { - if (self = [super init]) + if ((self = [super init])) { #ifdef NS_IMPL_COCOA self->isFirst = YES; @@ -5272,9 +5273,6 @@ not_in_argv (NSString *arg) int code; unsigned fnKeysym = 0; static NSMutableArray *nsEvArray; -#ifdef NS_IMPL_GNUSTEP - static BOOL firstTime = YES; -#endif int left_is_none; unsigned int flags = [theEvent modifierFlags]; @@ -5503,18 +5501,6 @@ not_in_argv (NSString *arg) } -#ifdef NS_IMPL_GNUSTEP - /* if we get here we should send the key for input manager processing */ - /* Disable warning, there is nothing a user can do about it anyway, and - it does not seem to matter. */ -#if 0 - if (firstTime && [[NSInputManager currentInputManager] - wantsToDelayTextChangeNotifications] == NO) - fprintf (stderr, - "Emacs: WARNING: TextInput mgr wants marked text to be permanent!\n"); -#endif - firstTime = NO; -#endif if (NS_KEYLOG && !processingCompose) fprintf (stderr, "keyDown: Begin compose sequence.\n"); @@ -7202,7 +7188,6 @@ if (cols > 0 && rows > 0) one screen, we want to constrain. Other times not. */ NSArray *screens = [NSScreen screens]; NSUInteger nr_screens = [screens count], nr_eff_screens = 0, i; - struct frame *f = ((EmacsView *)[self delegate])->emacsframe; NSTRACE (constrainFrameRect); NSTRACE_RECT ("input", frameRect); |