Include w32term.h, move widget related

defs there.

diff --git a/src/menu.c b/src/menu.c
index 2cf94924ffdbf5ab1129d2c9045563babf303c31..74f3add87a67fe613c39908fd6b59cec6dedade9 100644 (file)
--- a/src/menu.c
+++ b/src/menu.c
@@ -41,33 +41,7 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 #endif
 
 #ifdef HAVE_NTGUI
-/* Definitions copied from lwlib.h */
-typedef void * XtPointer;
-typedef char Boolean;
-enum button_type
-{
-  BUTTON_TYPE_NONE,
-  BUTTON_TYPE_TOGGLE,
-  BUTTON_TYPE_RADIO
-};
-
-/* This structure is based on the one in ../lwlib/lwlib.h  */
-typedef struct _widget_value
-{
-  Lisp_Object   lname;
-  char*                name;
-  char*                value;
-  Lisp_Object   lkey;
-  char*                key;
-  Lisp_Object  help;
-  Boolean      enabled;
-  Boolean      selected;
-  enum button_type button_type;
-  Boolean       title;
-  struct _widget_value*        contents;
-  XtPointer    call_data;
-  struct _widget_value*        next;
-} widget_value;
+#include "w32term.h"
 
 /* Local memory management */
 #define local_heap (GetProcessHeap ())