diff options
| author | Alexander Gramiak <agrambot@gmail.com> | 2019-03-16 11:46:39 -0600 |
|---|---|---|
| committer | Alexander Gramiak <agrambot@gmail.com> | 2019-03-16 13:15:07 -0600 |
| commit | cc06d76865a7a98b5fd4edd03a044f2baefb85a9 (patch) | |
| tree | bebc69c07239c84cbaf8693f99d25d099fcd2072 /src/xfns.c | |
| parent | 7d8fe1f9f66110b23972869496e2000e9c35bb6d (diff) | |
| download | emacs-cc06d76865a7a98b5fd4edd03a044f2baefb85a9.tar.gz | |
Define macros to abstract support for external menu/tool-bars
* src/lisp.h (HAVE_EXT_MENU_BAR)
(HAVE_EXT_TOOL_BAR): Define.
*src/dispnew.c:
*src/frame.c:
*src/frame.h:
*src/keyboard.c:
*src/menu.c:
*src/menu.h:
*src/window.c:
*src/window.h:
*src/xdisp.c:
*src/xfns: Use the new macros.
Diffstat (limited to 'src/xfns.c')
| -rw-r--r-- | src/xfns.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/xfns.c b/src/xfns.c index a627b7e19e6..f238a3daa15 100644 --- a/src/xfns.c +++ b/src/xfns.c @@ -5132,7 +5132,7 @@ frame_geometry (Lisp_Object frame, Lisp_Object attribute) inner_right = native_right - internal_border_width; inner_bottom = native_bottom - internal_border_width; -#if defined (USE_X_TOOLKIT) || defined (USE_GTK) +#ifdef HAVE_EXT_MENU_BAR menu_bar_external = true; menu_bar_height = FRAME_MENUBAR_HEIGHT (f); native_top += menu_bar_height; @@ -5143,7 +5143,7 @@ frame_geometry (Lisp_Object frame, Lisp_Object attribute) #endif menu_bar_width = menu_bar_height ? native_width : 0; -#if defined (USE_GTK) +#ifdef HAVE_EXT_TOOL_BAR tool_bar_external = true; if (EQ (FRAME_TOOL_BAR_POSITION (f), Qleft)) { |