Commit cc98b6a0 authored by Dan Nicolaescu's avatar Dan Nicolaescu

(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.
parent 1baa6236
2008-07-22 Dan Nicolaescu <dann@ics.uci.edu> 2008-07-22 Dan Nicolaescu <dann@ics.uci.edu>
* 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. * nsterm.m (syms_of_nsterm): Move to the end of file.
* dispnew.c (init_display): Remove code for X10. * dispnew.c (init_display): Remove code for X10.
......
...@@ -712,8 +712,8 @@ Turn the input menu (an NSMenu) into a lisp list for tracking on lisp side ...@@ -712,8 +712,8 @@ Turn the input menu (an NSMenu) into a lisp list for tracking on lisp side
} }
static void void
ns_set_menu_bar_lines (struct frame *f, Lisp_Object value, Lisp_Object oldval) x_set_menu_bar_lines (struct frame *f, Lisp_Object value, Lisp_Object oldval)
{ {
int nlines; int nlines;
int olines = FRAME_MENU_BAR_LINES (f); int olines = FRAME_MENU_BAR_LINES (f);
...@@ -729,30 +729,22 @@ Turn the input menu (an NSMenu) into a lisp list for tracking on lisp side ...@@ -729,30 +729,22 @@ Turn the input menu (an NSMenu) into a lisp list for tracking on lisp side
if (nlines) if (nlines)
{ {
FRAME_EXTERNAL_MENU_BAR (f) = 1; FRAME_EXTERNAL_MENU_BAR (f) = 1;
/* does for all frames, whereas we just want for one frame /* does for all frames, whereas we just want for one frame
[NSMenu setMenuBarVisible: YES]; */ [NSMenu setMenuBarVisible: YES]; */
} }
else else
{ {
if (FRAME_EXTERNAL_MENU_BAR (f) == 1) if (FRAME_EXTERNAL_MENU_BAR (f) == 1)
free_frame_menubar (f); free_frame_menubar (f);
/* [NSMenu setMenuBarVisible: NO]; */ /* [NSMenu setMenuBarVisible: NO]; */
FRAME_EXTERNAL_MENU_BAR (f) = 0; 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 */ /* 23: toolbar support */
static void void
ns_set_tool_bar_lines (struct frame *f, Lisp_Object value, Lisp_Object oldval) x_set_tool_bar_lines (struct frame *f, Lisp_Object value, Lisp_Object oldval)
{ {
int nlines; int nlines;
Lisp_Object root_window; Lisp_Object root_window;
...@@ -783,14 +775,6 @@ Turn the input menu (an NSMenu) into a lisp list for tracking on lisp side ...@@ -783,14 +775,6 @@ Turn the input menu (an NSMenu) into a lisp list for tracking on lisp side
} }
/* 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 void
ns_implicitly_set_icon_type (struct frame *f) ns_implicitly_set_icon_type (struct frame *f)
{ {
...@@ -1023,7 +1007,7 @@ Turn the input menu (an NSMenu) into a lisp list for tracking on lisp side ...@@ -1023,7 +1007,7 @@ Turn the input menu (an NSMenu) into a lisp list for tracking on lisp side
ns_set_icon_name, ns_set_icon_name,
ns_set_icon_type, ns_set_icon_type,
x_set_internal_border_width, /* generic OK */ x_set_internal_border_width, /* generic OK */
ns_set_menu_bar_lines, x_set_menu_bar_lines,
ns_set_mouse_color, ns_set_mouse_color,
ns_explicitly_set_name, ns_explicitly_set_name,
x_set_scroll_bar_width, /* generic OK */ x_set_scroll_bar_width, /* generic OK */
...@@ -1031,7 +1015,7 @@ Turn the input menu (an NSMenu) into a lisp list for tracking on lisp side ...@@ -1031,7 +1015,7 @@ Turn the input menu (an NSMenu) into a lisp list for tracking on lisp side
x_set_unsplittable, /* generic OK */ x_set_unsplittable, /* generic OK */
x_set_vertical_scroll_bars, /* generic OK */ x_set_vertical_scroll_bars, /* generic OK */
x_set_visibility, /* 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_foreground, will ignore (not possible on NS) */
0, /* x_set_scroll_bar_background, will ignore (not possible on NS) */ 0, /* x_set_scroll_bar_background, will ignore (not possible on NS) */
x_set_screen_gamma, /* generic OK */ x_set_screen_gamma, /* generic OK */
...@@ -2590,6 +2574,78 @@ DY added (default is -10). ...@@ -2590,6 +2574,78 @@ DY added (default is -10).
} }
/* ==========================================================================
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 Lisp interface declaration
...@@ -2684,78 +2740,4 @@ DY added (default is -10). ...@@ -2684,78 +2740,4 @@ DY added (default is -10).
} }
/* ==========================================================================
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 // arch-tag: dc2a3f74-1123-4daa-8eed-fb78db6a5642
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment