aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorGerd Moellmann2001-03-13 16:26:25 +0000
committerGerd Moellmann2001-03-13 16:26:25 +0000
commit2756b446fd9f2b128a71a6f0e515631b305e994c (patch)
tree6dc8d331ecc33efe91cc21f1ff3f4e38f1a4a83e /src
parentafcdc0a1393988cac487df14bf14696d9a64e669 (diff)
downloademacs-2756b446fd9f2b128a71a6f0e515631b305e994c.tar.gz
emacs-2756b446fd9f2b128a71a6f0e515631b305e994c.zip
(popup_activate_callback, popup_deactivate_callback):
Remove special handling for LessTif/Motif. (toplevel): Don't include Xm/Xm.h.
Diffstat (limited to 'src')
-rw-r--r--src/xmenu.c12
1 files changed, 0 insertions, 12 deletions
diff --git a/src/xmenu.c b/src/xmenu.c
index 004458adeda..9d048cb8406 100644
--- a/src/xmenu.c
+++ b/src/xmenu.c
@@ -80,10 +80,6 @@ Boston, MA 02111-1307, USA. */
80#endif /* not USE_X_TOOLKIT */ 80#endif /* not USE_X_TOOLKIT */
81#endif /* HAVE_X_WINDOWS */ 81#endif /* HAVE_X_WINDOWS */
82 82
83#ifdef USE_MOTIF
84#include <Xm/Xm.h> /* for LESSTIF_VERSION */
85#endif
86
87#define min(x,y) (((x) < (y)) ? (x) : (y)) 83#define min(x,y) (((x) < (y)) ? (x) : (y))
88#define max(x,y) (((x) > (y)) ? (x) : (y)) 84#define max(x,y) (((x) > (y)) ? (x) : (y))
89 85
@@ -1154,11 +1150,7 @@ popup_activate_callback (widget, id, client_data)
1154 LWLIB_ID id; 1150 LWLIB_ID id;
1155 XtPointer client_data; 1151 XtPointer client_data;
1156{ 1152{
1157#ifdef USE_MOTIF
1158 ++popup_activated_flag;
1159#else
1160 popup_activated_flag = 1; 1153 popup_activated_flag = 1;
1161#endif
1162} 1154}
1163 1155
1164/* This callback is invoked when a dialog or menu is finished being 1156/* This callback is invoked when a dialog or menu is finished being
@@ -1170,11 +1162,7 @@ popup_deactivate_callback (widget, id, client_data)
1170 LWLIB_ID id; 1162 LWLIB_ID id;
1171 XtPointer client_data; 1163 XtPointer client_data;
1172{ 1164{
1173#ifdef USE_MOTIF
1174 --popup_activated_flag;
1175#else
1176 popup_activated_flag = 0; 1165 popup_activated_flag = 0;
1177#endif
1178} 1166}
1179 1167
1180/* Lwlib callback called when menu items are highlighted/unhighlighted 1168/* Lwlib callback called when menu items are highlighted/unhighlighted