Mercurial > emacs
diff 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 |
line wrap: on
line diff
--- a/src/frame.h Tue Jun 12 08:21:39 2007 +0000 +++ b/src/frame.h Sat Jun 16 22:33:42 2007 +0000 @@ -197,7 +197,7 @@ be used for output. */ unsigned glyphs_initialized_p : 1; -#if defined (USE_GTK) +#if defined (USE_GTK) || defined (MAC_OS) /* Nonzero means using a tool bar that comes from the toolkit. */ int external_tool_bar; #endif @@ -534,7 +534,7 @@ /* Nonzero if this frame should display a tool bar in a way that does not use any text lines. */ -#if defined (USE_GTK) +#if defined (USE_GTK) || defined (MAC_OS) #define FRAME_EXTERNAL_TOOL_BAR(f) (f)->external_tool_bar #else #define FRAME_EXTERNAL_TOOL_BAR(f) 0