[Emacs-diffs] Changes to emacs/src/menu.c,v

[Jason Rumney]

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     Jason Rumney <jasonr>   08/06/09 12:36:49

Index: menu.c
===================================================================
RCS file: /sources/emacs/emacs/src/menu.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- menu.c      8 Jun 2008 18:09:06 -0000       1.3
+++ menu.c      9 Jun 2008 12:36:49 -0000       1.4
@@ -41,33 +41,7 @@
 #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 ())