From cc98b6a06aa7505a2c5c08c3851f48bfabd5ccf0 Mon Sep 17 00:00:00 2001 From: Dan Nicolaescu Date: Tue, 22 Jul 2008 16:29:10 +0000 Subject: [PATCH] (x_set_menu_bar_lines, x_set_tool_bar_lines): Remove forwarding functions. (ns_set_menu_bar_lines): Rename to x_set_menu_bar_lines, make non-static. (ns_set_tool_bar_lines): Rename to x_set_tool_bar_lines, make non-static. (ns_frame_parm_handlers): Use the new names. (syms_of_nsfns): Move to the end of file. --- src/ChangeLog | 9 +++ src/nsfns.m | 180 +++++++++++++++++++++++--------------------------- 2 files changed, 90 insertions(+), 99 deletions(-) diff --git a/src/ChangeLog b/src/ChangeLog index d545e9e4ef8..122b58a502e 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,5 +1,14 @@ 2008-07-22 Dan Nicolaescu + * nsfns.m (x_set_menu_bar_lines, x_set_tool_bar_lines): Remove + forwarding functions. + (ns_set_menu_bar_lines): Rename to x_set_menu_bar_lines, make + non-static. + (ns_set_tool_bar_lines): Rename to x_set_tool_bar_lines, make + non-static. + (ns_frame_parm_handlers): Use the new names. + (syms_of_nsfns): Move to the end of file. + * nsterm.m (syms_of_nsterm): Move to the end of file. * dispnew.c (init_display): Remove code for X10. diff --git a/src/nsfns.m b/src/nsfns.m index 40016d9479b..4595ea51f17 100644 --- a/src/nsfns.m +++ b/src/nsfns.m @@ -712,8 +712,8 @@ ns_set_doc_edited (struct frame *f, Lisp_Object arg, Lisp_Object oldval) } -static void -ns_set_menu_bar_lines (struct frame *f, Lisp_Object value, Lisp_Object oldval) +void +x_set_menu_bar_lines (struct frame *f, Lisp_Object value, Lisp_Object oldval) { int nlines; int olines = FRAME_MENU_BAR_LINES (f); @@ -729,30 +729,22 @@ ns_set_menu_bar_lines (struct frame *f, Lisp_Object value, Lisp_Object oldval) if (nlines) { FRAME_EXTERNAL_MENU_BAR (f) = 1; -/* does for all frames, whereas we just want for one frame - [NSMenu setMenuBarVisible: YES]; */ + /* does for all frames, whereas we just want for one frame + [NSMenu setMenuBarVisible: YES]; */ } else { if (FRAME_EXTERNAL_MENU_BAR (f) == 1) free_frame_menubar (f); -/* [NSMenu setMenuBarVisible: NO]; */ + /* [NSMenu setMenuBarVisible: NO]; */ FRAME_EXTERNAL_MENU_BAR (f) = 0; } } -/* 23: XXX: there is an erroneous direct call in window.c to this fn */ -void -x_set_menu_bar_lines (struct frame *f, Lisp_Object value, Lisp_Object oldval) -{ - ns_set_menu_bar_lines (f, value, oldval); -} - - /* 23: toolbar support */ -static void -ns_set_tool_bar_lines (struct frame *f, Lisp_Object value, Lisp_Object oldval) +void +x_set_tool_bar_lines (struct frame *f, Lisp_Object value, Lisp_Object oldval) { int nlines; Lisp_Object root_window; @@ -783,14 +775,6 @@ ns_set_tool_bar_lines (struct frame *f, Lisp_Object value, Lisp_Object oldval) } -/* 23: XXX: there is an erroneous direct call in window.c to this fn */ -void -x_set_tool_bar_lines (struct frame *f, Lisp_Object value, Lisp_Object oldval) -{ - ns_set_tool_bar_lines (f, value, oldval); -} - - void ns_implicitly_set_icon_type (struct frame *f) { @@ -1023,7 +1007,7 @@ frame_parm_handler ns_frame_parm_handlers[] = ns_set_icon_name, ns_set_icon_type, x_set_internal_border_width, /* generic OK */ - ns_set_menu_bar_lines, + x_set_menu_bar_lines, ns_set_mouse_color, ns_explicitly_set_name, x_set_scroll_bar_width, /* generic OK */ @@ -1031,7 +1015,7 @@ frame_parm_handler ns_frame_parm_handlers[] = x_set_unsplittable, /* generic OK */ x_set_vertical_scroll_bars, /* generic OK */ x_set_visibility, /* generic OK */ - ns_set_tool_bar_lines, + x_set_tool_bar_lines, 0, /* x_set_scroll_bar_foreground, will ignore (not possible on NS) */ 0, /* x_set_scroll_bar_background, will ignore (not possible on NS) */ x_set_screen_gamma, /* generic OK */ @@ -2590,6 +2574,78 @@ Value is t if tooltip was open, nil otherwise. */) } +/* ========================================================================== + + Class implementations + + ========================================================================== */ + + +@implementation EmacsSavePanel +#ifdef NS_IMPL_COCOA +/* -------------------------------------------------------------------------- + These are overridden to intercept on OS X: ending panel restarts NSApp + event loop if it is stopped. Not sure if this is correct behavior, + perhaps should check if running and if so send an appdefined. + -------------------------------------------------------------------------- */ +- (void) ok: (id)sender +{ + [super ok: sender]; + panelOK = 1; + [NSApp stop: self]; +} +- (void) cancel: (id)sender +{ + [super cancel: sender]; + [NSApp stop: self]; +} +#endif +@end + + +@implementation EmacsOpenPanel +#ifdef NS_IMPL_COCOA +/* -------------------------------------------------------------------------- + These are overridden to intercept on OS X: ending panel restarts NSApp + event loop if it is stopped. Not sure if this is correct behavior, + perhaps should check if running and if so send an appdefined. + -------------------------------------------------------------------------- */ +- (void) ok: (id)sender +{ + [super ok: sender]; + panelOK = 1; + [NSApp stop: self]; +} +- (void) cancel: (id)sender +{ + [super cancel: sender]; + [NSApp stop: self]; +} +#endif +@end + + +@implementation EmacsFileDelegate +/* -------------------------------------------------------------------------- + Delegate methods for Open/Save panels + -------------------------------------------------------------------------- */ +- (BOOL)panel: (id)sender isValidFilename: (NSString *)filename +{ + return YES; +} +- (BOOL)panel: (id)sender shouldShowFilename: (NSString *)filename +{ + return YES; +} +- (NSString *)panel: (id)sender userEnteredFilename: (NSString *)filename + confirmed: (BOOL)okFlag +{ + return filename; +} +@end + +#endif + /* ========================================================================== Lisp interface declaration @@ -2684,78 +2740,4 @@ be used as the image of the icon representing the frame. */); } - - -/* ========================================================================== - - Class implementations - - ========================================================================== */ - - -@implementation EmacsSavePanel -#ifdef NS_IMPL_COCOA -/* -------------------------------------------------------------------------- - These are overridden to intercept on OS X: ending panel restarts NSApp - event loop if it is stopped. Not sure if this is correct behavior, - perhaps should check if running and if so send an appdefined. - -------------------------------------------------------------------------- */ -- (void) ok: (id)sender -{ - [super ok: sender]; - panelOK = 1; - [NSApp stop: self]; -} -- (void) cancel: (id)sender -{ - [super cancel: sender]; - [NSApp stop: self]; -} -#endif -@end - - -@implementation EmacsOpenPanel -#ifdef NS_IMPL_COCOA -/* -------------------------------------------------------------------------- - These are overridden to intercept on OS X: ending panel restarts NSApp - event loop if it is stopped. Not sure if this is correct behavior, - perhaps should check if running and if so send an appdefined. - -------------------------------------------------------------------------- */ -- (void) ok: (id)sender -{ - [super ok: sender]; - panelOK = 1; - [NSApp stop: self]; -} -- (void) cancel: (id)sender -{ - [super cancel: sender]; - [NSApp stop: self]; -} -#endif -@end - - -@implementation EmacsFileDelegate -/* -------------------------------------------------------------------------- - Delegate methods for Open/Save panels - -------------------------------------------------------------------------- */ -- (BOOL)panel: (id)sender isValidFilename: (NSString *)filename -{ - return YES; -} -- (BOOL)panel: (id)sender shouldShowFilename: (NSString *)filename -{ - return YES; -} -- (NSString *)panel: (id)sender userEnteredFilename: (NSString *)filename - confirmed: (BOOL)okFlag -{ - return filename; -} -@end - -#endif - // arch-tag: dc2a3f74-1123-4daa-8eed-fb78db6a5642 -- 2.39.2