(popup_activate_callback, popup_deactivate_callback):

Remove special handling for LessTif/Motif.
(toplevel): Don't include Xm/Xm.h.

diff --git a/src/xmenu.c b/src/xmenu.c
index 004458adeda6779c079ace7acd6fd643c94ae017..9d048cb8406727971be715b9a02a7d9f3ed08361 100644 (file)
--- a/src/xmenu.c
+++ b/src/xmenu.c
@@ -80,10 +80,6 @@ Boston, MA 02111-1307, USA.  */
 #endif /* not USE_X_TOOLKIT */
 #endif /* HAVE_X_WINDOWS */
 
-#ifdef USE_MOTIF
-#include <Xm/Xm.h>             /* for LESSTIF_VERSION */
-#endif
-
 #define min(x,y) (((x) < (y)) ? (x) : (y))
 #define max(x,y) (((x) > (y)) ? (x) : (y))
 
@@ -1154,11 +1150,7 @@ popup_activate_callback (widget, id, client_data)
      LWLIB_ID id;
      XtPointer client_data;
 {
-#ifdef USE_MOTIF
-  ++popup_activated_flag;
-#else
   popup_activated_flag = 1;
-#endif
 }
 
 /* This callback is invoked when a dialog or menu is finished being
@@ -1170,11 +1162,7 @@ popup_deactivate_callback (widget, id, client_data)
      LWLIB_ID id;
      XtPointer client_data;
 {
-#ifdef USE_MOTIF
-  --popup_activated_flag;
-#else
   popup_activated_flag = 0;
-#endif
 }
 
 /* Lwlib callback called when menu items are highlighted/unhighlighted