mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2026-01-10 05:30:45 -08:00
Code Issues Projects Releases Wiki Activity

(x_default_scroll_bar_color_parameter)

Browse source 
(x_set_scroll_bar_foreground, x_set_scroll_bar_background): Remove
unnecessary prototypes.
(x_set_scroll_bar_default_width): Use
MAC_AQUA_VERTICAL_SCROLL_BAR_WIDTH.
(mac_set_scroll_bar_width): New function.
(mac_frame_parm_handlers): Set it as handler for scroll-bar-width.
This commit is contained in:
YAMAMOTO Mitsuharu 2006-03-06 07:55:53 +00:00
parent a79fbdcb7f
commit 8950bc7363
1 changed files with 20 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

31
src/macfns.c
View file

@ -210,15 +210,6 @@ void x_explicitly_set_name P_ ((struct frame *, Lisp_Object, Lisp_Object));
void x_set_menu_bar_lines P_ ((struct frame *, Lisp_Object, Lisp_Object));
void x_set_title P_ ((struct frame *, Lisp_Object, Lisp_Object));
void x_set_tool_bar_lines P_ ((struct frame *, Lisp_Object, Lisp_Object));
void x_set_scroll_bar_foreground P_ ((struct frame *, Lisp_Object,
Lisp_Object));
void x_set_scroll_bar_background P_ ((struct frame *, Lisp_Object,
Lisp_Object));
static Lisp_Object x_default_scroll_bar_color_parameter P_ ((struct frame *,
Lisp_Object,
Lisp_Object,
char *, char *,
int));
extern void mac_get_window_bounds P_ ((struct frame *, Rect *, Rect *));
@ -1897,7 +1888,7 @@ x_set_scroll_bar_default_width (f)
int wid = FRAME_COLUMN_WIDTH (f);
#ifdef MAC_OSX
FRAME_CONFIG_SCROLL_BAR_WIDTH (f) = 16; /* Aqua scroll bars. */
FRAME_CONFIG_SCROLL_BAR_WIDTH (f) = MAC_AQUA_VERTICAL_SCROLL_BAR_WIDTH;
FRAME_CONFIG_SCROLL_BAR_COLS (f) = (FRAME_CONFIG_SCROLL_BAR_WIDTH (f) +
wid - 1) / wid;
#else /* not MAC_OSX */
@ -1911,6 +1902,24 @@ x_set_scroll_bar_default_width (f)
#endif /* not MAC_OSX */
}
void
mac_set_scroll_bar_width (f, arg, oldval)
struct frame *f;
Lisp_Object arg, oldval;
{
#ifdef MAC_OSX
if (INTEGERP (arg) && XINT (arg) > 0)
{
if (XINT (arg) < (MAC_AQUA_SMALL_VERTICAL_SCROLL_BAR_WIDTH
+ MAC_AQUA_VERTICAL_SCROLL_BAR_WIDTH) / 2)
XSETINT (arg, MAC_AQUA_SMALL_VERTICAL_SCROLL_BAR_WIDTH);
else
XSETINT (arg, MAC_AQUA_VERTICAL_SCROLL_BAR_WIDTH);
}
#endif
x_set_scroll_bar_width (f, arg, oldval);
}
/* Subroutines of creating a frame. */
@ -4373,7 +4382,7 @@ frame_parm_handler mac_frame_parm_handlers[] =
x_set_menu_bar_lines,
x_set_mouse_color,
x_explicitly_set_name,
x_set_scroll_bar_width,
mac_set_scroll_bar_width,
x_set_title,
x_set_unsplittable,
x_set_vertical_scroll_bars,