diff options
| author | Richard M. Stallman <rms@gnu.org> | 1994-10-15 23:51:54 +0000 |
|---|---|---|
| committer | Richard M. Stallman <rms@gnu.org> | 1994-10-15 23:51:54 +0000 |
| commit | 0972b8ad80688eddf1f439d42b60db5235b4f7e8 (patch) | |
| tree | 8562c06fd0b4dbde8f8ff65d6755c14d408e4114 /src/xmenu.c | |
| parent | 3e31c400acdbcf361b527b2a7684792b61c1e016 (diff) | |
| download | emacs-0972b8ad80688eddf1f439d42b60db5235b4f7e8.tar.gz | |
Delete HAVE_X11 conditionals.
Diffstat (limited to 'src/xmenu.c')
| -rw-r--r-- | src/xmenu.c | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/src/xmenu.c b/src/xmenu.c index 4e87f706044..10732855e8a 100644 --- a/src/xmenu.c +++ b/src/xmenu.c @@ -54,11 +54,7 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. */ #include "dispextern.h" -#ifdef HAVE_X11 #include "../oldXMenu/XMenu.h" -#else -#include <X/XMenu.h> -#endif #ifdef USE_X_TOOLKIT #include <X11/Xlib.h> @@ -77,11 +73,7 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. */ #define FALSE 0 #endif /* no TRUE */ -#ifdef HAVE_X11 extern Display *x_current_display; -#else -#define ButtonReleaseMask ButtonReleased -#endif /* not HAVE_X11 */ extern Lisp_Object Qmenu_enable; extern Lisp_Object Qmenu_bar; @@ -2080,7 +2072,6 @@ xmenu_show (f, x, y, menubarp, keymaps, title, error) } /* Adjust coordinates to relative to the outer (window manager) window. */ -#ifdef HAVE_X11 { Window child; int win_x = 0, win_y = 0; @@ -2106,7 +2097,6 @@ xmenu_show (f, x, y, menubarp, keymaps, title, error) y += win_y; } } -#endif /* HAVE_X11 */ /* Adjust coordinates to be root-window-relative. */ x += f->display.x->left_pos; |