diff options
| author | Dmitry Antipov <dmantipov@yandex.ru> | 2013-03-22 16:41:34 +0400 |
|---|---|---|
| committer | Dmitry Antipov <dmantipov@yandex.ru> | 2013-03-22 16:41:34 +0400 |
| commit | 5a49b79cf8ba88f0044f2a358bd83a1d2a14d412 (patch) | |
| tree | dd9a4874c043d791d31368eed0ad09e80763d54d /src/window.h | |
| parent | 7b1123d824e51d40496c242e7a7f173de8936100 (diff) | |
| download | emacs-5a49b79cf8ba88f0044f2a358bd83a1d2a14d412.tar.gz | |
* frame.h (struct frame): Put menu_bar_window under #ifdef
because this member is not needed when X toolkit is in use.
(fset_menu_bar_window):
* dispnew.c (clear_current_matrices, clear_desired_matrices)
(free_glyphs, update_frame):
* xdisp.c (expose_frame): Likewise.
(display_menu_bar): Likewise. Remove redundant eassert.
* window.h (WINDOW_MENU_BAR_P): Always define to 0 if X
toolkit is in use.
Diffstat (limited to 'src/window.h')
| -rw-r--r-- | src/window.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/src/window.h b/src/window.h index 4f6374b9d3e..71c438ff7f2 100644 --- a/src/window.h +++ b/src/window.h @@ -512,9 +512,14 @@ wset_next_buffers (struct window *w, Lisp_Object val) /* 1 if W is a menu bar window. */ +#if defined (HAVE_X_WINDOWS) && ! defined (USE_X_TOOLKIT) && ! defined (USE_GTK) #define WINDOW_MENU_BAR_P(W) \ (WINDOWP (WINDOW_XFRAME (W)->menu_bar_window) \ && (W) == XWINDOW (WINDOW_XFRAME (W)->menu_bar_window)) +#else +/* No menu bar windows if X toolkit is in use. */ +#define WINDOW_MENU_BAR_P(W) (0) +#endif /* 1 if W is a tool bar window. */ |