Mercurial > emacs
comparison src/xmenu.c @ 9546:c5a0a84a76a7
Delete HAVE_X11 conditionals.
| author | Richard M. Stallman <rms@gnu.org> |
|---|---|
| date | Sat, 15 Oct 1994 23:51:54 +0000 |
| parents | e5ecfda9e730 |
| children | b36d5e88cccc |
comparison
equal
deleted
inserted
replaced
| 9545:0773b7048206 | 9546:c5a0a84a76a7 |
|---|---|
| 52 #include <sys/types.h> | 52 #include <sys/types.h> |
| 53 #endif | 53 #endif |
| 54 | 54 |
| 55 #include "dispextern.h" | 55 #include "dispextern.h" |
| 56 | 56 |
| 57 #ifdef HAVE_X11 | |
| 58 #include "../oldXMenu/XMenu.h" | 57 #include "../oldXMenu/XMenu.h" |
| 59 #else | |
| 60 #include <X/XMenu.h> | |
| 61 #endif | |
| 62 | 58 |
| 63 #ifdef USE_X_TOOLKIT | 59 #ifdef USE_X_TOOLKIT |
| 64 #include <X11/Xlib.h> | 60 #include <X11/Xlib.h> |
| 65 #include <X11/IntrinsicP.h> | 61 #include <X11/IntrinsicP.h> |
| 66 #include <X11/CoreP.h> | 62 #include <X11/CoreP.h> |
| 75 #ifndef TRUE | 71 #ifndef TRUE |
| 76 #define TRUE 1 | 72 #define TRUE 1 |
| 77 #define FALSE 0 | 73 #define FALSE 0 |
| 78 #endif /* no TRUE */ | 74 #endif /* no TRUE */ |
| 79 | 75 |
| 80 #ifdef HAVE_X11 | |
| 81 extern Display *x_current_display; | 76 extern Display *x_current_display; |
| 82 #else | |
| 83 #define ButtonReleaseMask ButtonReleased | |
| 84 #endif /* not HAVE_X11 */ | |
| 85 | 77 |
| 86 extern Lisp_Object Qmenu_enable; | 78 extern Lisp_Object Qmenu_enable; |
| 87 extern Lisp_Object Qmenu_bar; | 79 extern Lisp_Object Qmenu_bar; |
| 88 | 80 |
| 89 #ifdef USE_X_TOOLKIT | 81 #ifdef USE_X_TOOLKIT |
| 2078 *error = "Can't create menu"; | 2070 *error = "Can't create menu"; |
| 2079 return Qnil; | 2071 return Qnil; |
| 2080 } | 2072 } |
| 2081 | 2073 |
| 2082 /* Adjust coordinates to relative to the outer (window manager) window. */ | 2074 /* Adjust coordinates to relative to the outer (window manager) window. */ |
| 2083 #ifdef HAVE_X11 | |
| 2084 { | 2075 { |
| 2085 Window child; | 2076 Window child; |
| 2086 int win_x = 0, win_y = 0; | 2077 int win_x = 0, win_y = 0; |
| 2087 | 2078 |
| 2088 /* Find the position of the outside upper-left corner of | 2079 /* Find the position of the outside upper-left corner of |
| 2104 UNBLOCK_INPUT; | 2095 UNBLOCK_INPUT; |
| 2105 x += win_x; | 2096 x += win_x; |
| 2106 y += win_y; | 2097 y += win_y; |
| 2107 } | 2098 } |
| 2108 } | 2099 } |
| 2109 #endif /* HAVE_X11 */ | |
| 2110 | 2100 |
| 2111 /* Adjust coordinates to be root-window-relative. */ | 2101 /* Adjust coordinates to be root-window-relative. */ |
| 2112 x += f->display.x->left_pos; | 2102 x += f->display.x->left_pos; |
| 2113 y += f->display.x->top_pos; | 2103 y += f->display.x->top_pos; |
| 2114 | 2104 |