comparison src/frame.h @ 83635:9c01792a3ce8

Merge from emacs--devo--0 Patches applied: * emacs--devo--0 (patch 793-802) - Update from CVS - Remove RCS keywords - Merge from emacs--rel--22 * emacs--rel--22 (patch 42-50) - Update from CVS - Merge from gnus--rel--5.10 - Gnus ChangeLog tweaks * gnus--rel--5.10 (patch 229-232) - Merge from emacs--devo--0, emacs--rel--22 - ChangeLog tweak - Update from CVS Revision: emacs@sv.gnu.org/emacs--multi-tty--0--patch-23
author Miles Bader <miles@gnu.org>
date Sat, 16 Jun 2007 22:33:42 +0000
parents b8d9a391daf3 217675ce2532
children 2aee92eacdab
comparison
equal deleted inserted replaced
83634:391cce03f832 83635:9c01792a3ce8
195 195
196 /* 1 means that glyphs on this frame have been initialized so it can 196 /* 1 means that glyphs on this frame have been initialized so it can
197 be used for output. */ 197 be used for output. */
198 unsigned glyphs_initialized_p : 1; 198 unsigned glyphs_initialized_p : 1;
199 199
200 #if defined (USE_GTK) 200 #if defined (USE_GTK) || defined (MAC_OS)
201 /* Nonzero means using a tool bar that comes from the toolkit. */ 201 /* Nonzero means using a tool bar that comes from the toolkit. */
202 int external_tool_bar; 202 int external_tool_bar;
203 #endif 203 #endif
204 204
205 /* Margin at the top of the frame. Used to display the tool-bar. */ 205 /* Margin at the top of the frame. Used to display the tool-bar. */
532 These lines are counted in FRAME_LINES. */ 532 These lines are counted in FRAME_LINES. */
533 #define FRAME_MENU_BAR_LINES(f) (f)->menu_bar_lines 533 #define FRAME_MENU_BAR_LINES(f) (f)->menu_bar_lines
534 534
535 /* Nonzero if this frame should display a tool bar 535 /* Nonzero if this frame should display a tool bar
536 in a way that does not use any text lines. */ 536 in a way that does not use any text lines. */
537 #if defined (USE_GTK) 537 #if defined (USE_GTK) || defined (MAC_OS)
538 #define FRAME_EXTERNAL_TOOL_BAR(f) (f)->external_tool_bar 538 #define FRAME_EXTERNAL_TOOL_BAR(f) (f)->external_tool_bar
539 #else 539 #else
540 #define FRAME_EXTERNAL_TOOL_BAR(f) 0 540 #define FRAME_EXTERNAL_TOOL_BAR(f) 0
541 #endif 541 #endif
542 542