aboutsummaryrefslogtreecommitdiffstats
path: root/src/frame.h
diff options
context:
space:
mode:
authorPaul Eggert2014-08-01 08:12:01 -0700
committerPaul Eggert2014-08-01 08:12:01 -0700
commit3ee7618cf19fc8334e8fccdcf2eff01786426a64 (patch)
tree70d424b004d23990f8d82ef5e645d024cfbe19d9 /src/frame.h
parentf0316e9c5de6efb8b9b18721696d23722466aa62 (diff)
downloademacs-3ee7618cf19fc8334e8fccdcf2eff01786426a64.tar.gz
emacs-3ee7618cf19fc8334e8fccdcf2eff01786426a64.zip
Make functions static that no longer need to be extern.
* frame.c, frame.h (set_menu_bar_lines): * keyboard.c (Qleftmost, Qrightmost): * xfns.c, frame.h, menu.h (x_set_menu_bar_lines, x_set_tool_bar_lines) (x_set_internal_border_width): Now static.
Diffstat (limited to 'src/frame.h')
-rw-r--r--src/frame.h16
1 files changed, 6 insertions, 10 deletions
diff --git a/src/frame.h b/src/frame.h
index 51597c4bcdb..5d45dbfb268 100644
--- a/src/frame.h
+++ b/src/frame.h
@@ -45,9 +45,9 @@ enum fullscreen_type
45 FULLSCREEN_HEIGHT = 0x2, 45 FULLSCREEN_HEIGHT = 0x2,
46 FULLSCREEN_BOTH = 0x3, /* Not a typo but means "width and height". */ 46 FULLSCREEN_BOTH = 0x3, /* Not a typo but means "width and height". */
47 FULLSCREEN_MAXIMIZED = 0x4, 47 FULLSCREEN_MAXIMIZED = 0x4,
48#ifdef HAVE_NTGUI 48#ifdef HAVE_NTGUI
49 FULLSCREEN_WAIT = 0x8 49 FULLSCREEN_WAIT = 0x8
50#endif 50#endif
51}; 51};
52 52
53#endif /* HAVE_WINDOW_SYSTEM */ 53#endif /* HAVE_WINDOW_SYSTEM */
@@ -161,7 +161,7 @@ struct frame
161 /* Desired and current tool-bar items. */ 161 /* Desired and current tool-bar items. */
162 Lisp_Object tool_bar_items; 162 Lisp_Object tool_bar_items;
163 163
164#ifdef USE_GTK 164#ifdef USE_GTK
165 /* Where tool bar is, can be left, right, top or bottom. 165 /* Where tool bar is, can be left, right, top or bottom.
166 Except with GTK, the only supported position is `top'. */ 166 Except with GTK, the only supported position is `top'. */
167 Lisp_Object tool_bar_position; 167 Lisp_Object tool_bar_position;
@@ -185,7 +185,7 @@ struct frame
185 /* Number of elements in `menu_bar_vector' that have meaningful data. */ 185 /* Number of elements in `menu_bar_vector' that have meaningful data. */
186 int menu_bar_items_used; 186 int menu_bar_items_used;
187 187
188#if defined (USE_X_TOOLKIT) || defined (HAVE_NTGUI) 188#if defined (USE_X_TOOLKIT) || defined (HAVE_NTGUI)
189 /* A buffer to hold the frame's name. Since this is used by the 189 /* A buffer to hold the frame's name. Since this is used by the
190 window system toolkit, we can't use the Lisp string's pointer 190 window system toolkit, we can't use the Lisp string's pointer
191 (`name', above) because it might get relocated. */ 191 (`name', above) because it might get relocated. */
@@ -1089,7 +1089,6 @@ extern Lisp_Object Qtty_color_mode;
1089extern Lisp_Object Qterminal; 1089extern Lisp_Object Qterminal;
1090extern Lisp_Object Qnoelisp; 1090extern Lisp_Object Qnoelisp;
1091 1091
1092extern void set_menu_bar_lines (struct frame *, Lisp_Object, Lisp_Object);
1093extern struct frame *decode_window_system_frame (Lisp_Object); 1092extern struct frame *decode_window_system_frame (Lisp_Object);
1094extern struct frame *decode_live_frame (Lisp_Object); 1093extern struct frame *decode_live_frame (Lisp_Object);
1095extern struct frame *decode_any_frame (Lisp_Object); 1094extern struct frame *decode_any_frame (Lisp_Object);
@@ -1108,7 +1107,7 @@ extern void check_window_system (struct frame *);
1108extern void frame_make_pointer_invisible (struct frame *); 1107extern void frame_make_pointer_invisible (struct frame *);
1109extern void frame_make_pointer_visible (struct frame *); 1108extern void frame_make_pointer_visible (struct frame *);
1110extern Lisp_Object delete_frame (Lisp_Object, Lisp_Object); 1109extern Lisp_Object delete_frame (Lisp_Object, Lisp_Object);
1111extern bool frame_inhibit_resize (struct frame *, bool); 1110extern bool frame_inhibit_resize (struct frame *, bool);
1112extern void adjust_frame_size (struct frame *, int, int, int, bool); 1111extern void adjust_frame_size (struct frame *, int, int, int, bool);
1113 1112
1114extern Lisp_Object Vframe_list; 1113extern Lisp_Object Vframe_list;
@@ -1309,7 +1308,7 @@ extern Lisp_Object Vframe_list;
1309 ((height) \ 1308 ((height) \
1310 - FRAME_TOP_MARGIN_HEIGHT (f) \ 1309 - FRAME_TOP_MARGIN_HEIGHT (f) \
1311 - FRAME_SCROLL_BAR_AREA_HEIGHT (f) \ 1310 - FRAME_SCROLL_BAR_AREA_HEIGHT (f) \
1312 - 2 * FRAME_INTERNAL_BORDER_WIDTH (f)) 1311 - 2 * FRAME_INTERNAL_BORDER_WIDTH (f))
1313 1312
1314/* Return the width/height reserved for the windows of frame F. */ 1313/* Return the width/height reserved for the windows of frame F. */
1315#define FRAME_WINDOWS_WIDTH(f) \ 1314#define FRAME_WINDOWS_WIDTH(f) \
@@ -1393,8 +1392,6 @@ extern void x_set_font_backend (struct frame *, Lisp_Object, Lisp_Object);
1393extern void x_set_left_fringe (struct frame *, Lisp_Object, Lisp_Object); 1392extern void x_set_left_fringe (struct frame *, Lisp_Object, Lisp_Object);
1394extern void x_set_right_fringe (struct frame *, Lisp_Object, Lisp_Object); 1393extern void x_set_right_fringe (struct frame *, Lisp_Object, Lisp_Object);
1395extern void x_set_border_width (struct frame *, Lisp_Object, Lisp_Object); 1394extern void x_set_border_width (struct frame *, Lisp_Object, Lisp_Object);
1396extern void x_set_internal_border_width (struct frame *, Lisp_Object,
1397 Lisp_Object);
1398extern void x_set_right_divider_width (struct frame *, Lisp_Object, 1395extern void x_set_right_divider_width (struct frame *, Lisp_Object,
1399 Lisp_Object); 1396 Lisp_Object);
1400extern void x_set_bottom_divider_width (struct frame *, Lisp_Object, 1397extern void x_set_bottom_divider_width (struct frame *, Lisp_Object,
@@ -1429,7 +1426,6 @@ extern void x_make_frame_visible (struct frame *f);
1429extern void x_make_frame_invisible (struct frame *f); 1426extern void x_make_frame_invisible (struct frame *f);
1430extern void x_iconify_frame (struct frame *f); 1427extern void x_iconify_frame (struct frame *f);
1431extern void x_set_frame_alpha (struct frame *f); 1428extern void x_set_frame_alpha (struct frame *f);
1432extern void x_set_tool_bar_lines (struct frame *, Lisp_Object, Lisp_Object);
1433extern void x_activate_menubar (struct frame *); 1429extern void x_activate_menubar (struct frame *);
1434extern void x_real_positions (struct frame *, int *, int *); 1430extern void x_real_positions (struct frame *, int *, int *);
1435extern void free_frame_menubar (struct frame *); 1431extern void free_frame_menubar (struct frame *);