Do not require libXt-devel when building with gtk.

* lwlib/lwlib-widget.h: New file, with contents taken from lwlib.h.
(widget_value) [HAVE_NTGUI]: New member 'title'.
* lwlib/lwlib.h: Include lwlib-widget.h.
(change_type, enum button_type, widget_value):
Move to lwlib-widget.h.
* src/gtkutil.h, src/menu.h: Include lwlib-widget.h, not lwlib-h, to avoid
dependency on libXt-devel.
* src/menu.h [HAVE_NTGUI]: Include lwlib-widget.h in this case too.
(enum button_type, widget_value) [HAVE_NTGUI]: Remove, as
lwlib-widget.h now does this.
* src/nsmenu.m (ns_menu_show): "enabled" -> "enable" to fix typo.

4 files changed, 13 insertions, 46 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 39dde84f645..a6cbac808c2 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,13 @@
+2014-06-03  Paul Eggert  <eggert@cs.ucla.edu>
+
+        Do not require libXt-devel when building with gtk.
+        * gtkutil.h, menu.h: Include lwlib-widget.h, not lwlib-h, to avoid
+        dependency on libXt-devel.
+        * menu.h [HAVE_NTGUI]: Include lwlib-widget.h in this case too.
+        (enum button_type, widget_value) [HAVE_NTGUI]: Remove, as
+        lwlib-widget.h now does this.
+        * nsmenu.m (ns_menu_show): "enabled" -> "enable" to fix typo.
+
 2014-06-03  Paul Eggert  <eggert@penguin.cs.ucla.edu>
 
         If ENABLE_CHECKING, range-check args of FD_CLR, FD_ISSET, FD_SET.
diff --git a/src/gtkutil.h b/src/gtkutil.h
index 345b3283e6d..a69932cc25c 100644
--- a/src/gtkutil.h
+++ b/src/gtkutil.h
@@ -24,7 +24,7 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 #ifdef USE_GTK
 
 #include <gtk/gtk.h>
-#include "../lwlib/lwlib.h"
+#include "../lwlib/lwlib-widget.h"
 #include "frame.h"
 #include "xterm.h"
 
diff --git a/src/menu.h b/src/menu.h
index d71989ea1ef..266a471bc38 100644
--- a/src/menu.h
+++ b/src/menu.h
@@ -20,52 +20,9 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 #define MENU_H
 
 #include "systime.h" /* for Time */
-#if defined (USE_X_TOOLKIT) || defined (USE_GTK) || defined (HAVE_NS)
-#include "../lwlib/lwlib.h" /* for widget_value */
-#endif
+#include "../lwlib/lwlib-widget.h"
 
 #ifdef HAVE_NTGUI
-/* This is based on the one in ../lwlib/lwlib.h, with unused portions
-   removed.  HAVE_NTGUI cannot include lwlib.h, as that pulls in X11
-   headers.  */
-
-enum button_type
-{
-  BUTTON_TYPE_NONE,
-  BUTTON_TYPE_TOGGLE,
-  BUTTON_TYPE_RADIO
-};
-
-typedef struct _widget_value
-{
-  /* name of widget */
-  Lisp_Object   lname;
-  const char*   name;
-  /* value (meaning depend on widget type) */
-  const char*   value;
-  /* keyboard equivalent. no implications for XtTranslations */
-  Lisp_Object   lkey;
-  const char*   key;
-  /* Help string or nil if none.
-     GC finds this string through the frame's menu_bar_vector
-     or through menu_items.  */
-  Lisp_Object   help;
-  /* true if enabled */
-  unsigned char enabled;
-  /* true if selected */
-  unsigned char selected;
-  /* The type of a button.  */
-  enum button_type button_type;
-  /* true if menu title */
-  unsigned char title;
-  /* Contents of the sub-widgets, also selected slot for checkbox */
-  struct _widget_value* contents;
-  /* data passed to callback */
-  void  *call_data;
-  /* next one in the list */
-  struct _widget_value* next;
-} widget_value;
-
 extern Lisp_Object Qunsupported__w32_dialog;
 #endif
 
diff --git a/src/nsmenu.m b/src/nsmenu.m
index e5f0b7668bc..46b7400b2e4 100644
--- a/src/nsmenu.m
+++ b/src/nsmenu.m
@@ -943,7 +943,7 @@ ns_menu_show (struct frame *f, int x, int y, bool for_click, bool keymaps,
             }
 #endif /* not HAVE_MULTILINGUAL_MENU */
 
-          wv = make_widget_value (SSDATA (item_name), NULL, !NILP (enabled),
+          wv = make_widget_value (SSDATA (item_name), NULL, !NILP (enable),
                                   STRINGP (help) ? help : Qnil);
           if (prev_wv)
             prev_wv->next = wv;