import -ko -b 1.1.3 XEmacs XEmacs-21_2 r21-2-35

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

diff --git a/src/menubar-msw.c b/src/menubar-msw.c
index 7d5b4de..33f456a 100644 (file)
--- a/src/menubar-msw.c
+++ b/src/menubar-msw.c
@@ -78,7 +78,6 @@ Boston, MA 02111-1307, USA.  */
 
 #include <config.h>
 #include "lisp.h"
 
 #include <config.h>
 #include "lisp.h"

-#include <limits.h>

 
 #include "buffer.h"
 #include "commands.h"
 
 #include "buffer.h"
 #include "commands.h"

@@ -126,7 +125,7 @@ static HMENU top_level_menu;
    of not hitting an error, maxlen should be >= 2*len + 3. */
 
 Bytecount
    of not hitting an error, maxlen should be >= 2*len + 3. */
 
 Bytecount

-msw_translate_menu_or_dialog_item (Bufbyte *item, Bytecount len,
+mswindows_translate_menu_or_dialog_item (Bufbyte *item, Bytecount len,

                                   Bytecount maxlen, Emchar *accel,
                                   Lisp_Object error_name)
 {
                                   Bytecount maxlen, Emchar *accel,
                                   Lisp_Object error_name)
 {

@@ -209,7 +208,7 @@ displayable_menu_item (Lisp_Object gui_item, int bar_p, Emchar *accel)
   /* Left flush part of the string */
   ll = gui_item_display_flush_left (gui_item, buf, MAX_MENUITEM_LENGTH);
 
   /* Left flush part of the string */
   ll = gui_item_display_flush_left (gui_item, buf, MAX_MENUITEM_LENGTH);
 

-  ll = msw_translate_menu_or_dialog_item ((Bufbyte *) buf, ll,
+  ll = mswindows_translate_menu_or_dialog_item ((Bufbyte *) buf, ll,

                                          MAX_MENUITEM_LENGTH, accel,
                                          XGUI_ITEM (gui_item)->name);
 
                                          MAX_MENUITEM_LENGTH, accel,
                                          XGUI_ITEM (gui_item)->name);
 

@@ -668,7 +667,7 @@ menu_cleanup (struct frame *f)
 }
 
 int
 }
 
 int

-msw_char_is_accelerator (struct frame *f, Emchar ch)
+mswindows_char_is_accelerator (struct frame *f, Emchar ch)

 {
   Lisp_Object hash = FRAME_MSWINDOWS_MENU_HASH_TABLE (f);
 
 {
   Lisp_Object hash = FRAME_MSWINDOWS_MENU_HASH_TABLE (f);