XEmacs 21.2.28 "Hermes".

[chise/xemacs-chise.git.1] / src / menubar-msw.c

diff --git a/src/menubar-msw.c b/src/menubar-msw.c
index e3db02f..d25ccc6 100644 (file)
--- a/src/menubar-msw.c
+++ b/src/menubar-msw.c
@@ -116,8 +116,6 @@ static Lisp_Object current_hash_table;
 #define MENU_ITEM_ID_BITS(x) (((x) & 0x7FFF) | 0x8000)
 static HMENU top_level_menu;
 
 #define MENU_ITEM_ID_BITS(x) (((x) & 0x7FFF) | 0x8000)
 static HMENU top_level_menu;
 

-#define MAX_MENUITEM_LENGTH 128
-

 /*
  * This returns Windows-style menu item string:
  * "Left Flush\tRight Flush"
 /*
  * This returns Windows-style menu item string:
  * "Left Flush\tRight Flush"

@@ -280,7 +278,7 @@ populate_menu_add_item (HMENU menu, Lisp_Object path,
       /* Submenu */
       HMENU submenu;
       Lisp_Object gui_item = allocate_gui_item ();
       /* Submenu */
       HMENU submenu;
       Lisp_Object gui_item = allocate_gui_item ();

-      struct Lisp_Gui_Item* pgui_item = XGUI_ITEM (gui_item);
+      Lisp_Gui_Item* pgui_item = XGUI_ITEM (gui_item);

       struct gcpro gcpro1;
 
       GCPRO1 (gui_item);
       struct gcpro gcpro1;
 
       GCPRO1 (gui_item);

@@ -330,7 +328,7 @@ populate_menu_add_item (HMENU menu, Lisp_Object path,
       /* An ordinary item */
       Lisp_Object style, id;
       Lisp_Object gui_item = gui_parse_item_keywords (item);
       /* An ordinary item */
       Lisp_Object style, id;
       Lisp_Object gui_item = gui_parse_item_keywords (item);

-      struct Lisp_Gui_Item* pgui_item = XGUI_ITEM (gui_item);
+      Lisp_Gui_Item* pgui_item = XGUI_ITEM (gui_item);

       struct gcpro gcpro1;
 
       GCPRO1 (gui_item);
       struct gcpro gcpro1;
 
       GCPRO1 (gui_item);

@@ -395,7 +393,7 @@ populate_or_checksum_helper (HMENU menu, Lisp_Object path, Lisp_Object desc,
   struct gcpro gcpro1;
   unsigned long checksum;
   Lisp_Object gui_item = allocate_gui_item ();
   struct gcpro gcpro1;
   unsigned long checksum;
   Lisp_Object gui_item = allocate_gui_item ();

-  struct Lisp_Gui_Item* pgui_item = XGUI_ITEM (gui_item);
+  Lisp_Gui_Item* pgui_item = XGUI_ITEM (gui_item);

   GCPRO1 (gui_item);
 
   /* We are sometimes called with the menubar unchanged, and with changed
   GCPRO1 (gui_item);
 
   /* We are sometimes called with the menubar unchanged, and with changed

@@ -738,7 +736,7 @@ static void
 mswindows_popup_menu (Lisp_Object menu_desc, Lisp_Object event)
 {
   struct frame *f = selected_frame ();
 mswindows_popup_menu (Lisp_Object menu_desc, Lisp_Object event)
 {
   struct frame *f = selected_frame ();

-  struct Lisp_Event *eev = NULL;
+  Lisp_Event *eev = NULL;

   HMENU menu;
   POINT pt;
   int ok;
   HMENU menu;
   POINT pt;
   int ok;