Mercurial > hg > xemacs-beta

diff src/menubar-msw.c @ 867:804517e16990

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
[xemacs-hg @ 2002-06-05 09:54:39 by ben] Textual renaming: text/char names abbrev.c, alloc.c, buffer.c, buffer.h, bytecode.c, callint.c, casefiddle.c, casetab.c, charset.h, chartab.c, chartab.h, cmds.c, console-gtk.h, console-msw.c, console-msw.h, console-stream.c, console-tty.c, console-x.c, console-x.h, console.h, data.c, device-msw.c, device-x.c, dialog-msw.c, dired-msw.c, dired.c, doc.c, doprnt.c, editfns.c, eldap.c, emodules.c, eval.c, event-Xt.c, event-gtk.c, event-msw.c, event-stream.c, event-unixoid.c, events.c, events.h, file-coding.c, file-coding.h, fileio.c, filelock.c, fns.c, font-lock.c, frame-gtk.c, frame-msw.c, frame-x.c, frame.c, glyphs-eimage.c, glyphs-msw.c, glyphs-x.c, glyphs.c, glyphs.h, gpmevent.c, gui-x.c, gui-x.h, gui.c, gui.h, hpplay.c, indent.c, insdel.c, insdel.h, intl-win32.c, keymap.c, line-number.c, line-number.h, lisp-disunion.h, lisp-union.h, lisp.h, lread.c, lrecord.h, lstream.c, lstream.h, md5.c, menubar-msw.c, menubar-x.c, menubar.c, minibuf.c, mule-ccl.c, mule-charset.c, mule-coding.c, mule-wnnfns.c, ndir.h, nt.c, objects-gtk.c, objects-gtk.h, objects-msw.c, objects-tty.c, objects-x.c, objects.c, objects.h, postgresql.c, print.c, process-nt.c, process-unix.c, process.c, procimpl.h, realpath.c, redisplay-gtk.c, redisplay-msw.c, redisplay-output.c, redisplay-tty.c, redisplay-x.c, redisplay.c, redisplay.h, regex.c, search.c, select-common.h, select-gtk.c, select-x.c, sound.h, symbols.c, syntax.c, syntax.h, sysdep.c, sysdep.h, sysdir.h, sysfile.h, sysproc.h, syspwd.h, systime.h, syswindows.h, termcap.c, tests.c, text.c, text.h, toolbar-common.c, tooltalk.c, ui-gtk.c, unexnt.c, unicode.c, win32.c: Text/char naming rationalization. [a] distinguish between "charptr" when it refers to operations on the pointer itself and when it refers to operations on text; and [b] use consistent naming for everything referring to internal format, i.e. Itext == text in internal format Ibyte == a byte in such text Ichar == a char as represented in internal character format thus e.g. set_charptr_emchar -> set_itext_ichar The pre and post tags on either side of this change are: pre-internal-format-textual-renaming post-internal-format-textual-renaming See the Internals Manual for details of exactly how this was done, how to handle the change in your workspace, etc.
author ben
date Wed, 05 Jun 2002 09:58:45 +0000
parents 2b6fa2618f76
children 79c6ff3eef26
line wrap: on
line diff
--- a/src/menubar-msw.c	Tue Jun 04 17:40:00 2002 +0000
+++ b/src/menubar-msw.c	Wed Jun 05 09:58:45 2002 +0000
@@ -121,7 +121,7 @@
 
 /*
  * Translate X accelerator syntax to win32 accelerator syntax.
- * accel = (Emchar*) to receive the accelerator character
+ * accel = (Ichar*) to receive the accelerator character
  *         or NULL to suppress accelerators in the menu or dialog item.
  *
  * %% is replaced with %
@@ -135,10 +135,10 @@
  */
 
 Lisp_Object
-mswindows_translate_menu_or_dialog_item (Lisp_Object item, Emchar *accel)
+mswindows_translate_menu_or_dialog_item (Lisp_Object item, Ichar *accel)
 {
   Bytecount len = XSTRING_LENGTH (item);
-  Intbyte *it = (Intbyte *) ALLOCA (2 * len + 42), *ptr = it;
+  Ibyte *it = (Ibyte *) ALLOCA (2 * len + 42), *ptr = it;
 
   memcpy (ptr, XSTRING_DATA (item), len + 1);
   if (accel)
@@ -146,7 +146,7 @@
 
   /* Escape '&' as '&&' */
   
-  while ((ptr = (Intbyte *) memchr (ptr, '&', len - (ptr - it))) != NULL)
+  while ((ptr = (Ibyte *) memchr (ptr, '&', len - (ptr - it))) != NULL)
     {
       memmove (ptr + 1, ptr, (len - (ptr - it)) + 1);
       len++;
@@ -156,7 +156,7 @@
   /* Replace XEmacs accelerator '%_' with Windows accelerator '&'
      and `%%' with `%'. */
   ptr = it;
-  while ((ptr = (Intbyte *) memchr (ptr, '%', len - (ptr - it))) != NULL)
+  while ((ptr = (Ibyte *) memchr (ptr, '%', len - (ptr - it))) != NULL)
     {
       if (*(ptr + 1) == '_')
 	{
@@ -164,7 +164,7 @@
 	    {
 	      *ptr = '&';
 	      if (!*accel)
-		*accel = DOWNCASE (0, charptr_emchar (ptr + 2));
+		*accel = DOWNCASE (0, itext_ichar (ptr + 2));
 	      memmove (ptr + 1, ptr + 2, len - (ptr - it + 2) + 1);
 	      len--;
 	    }
@@ -189,7 +189,7 @@
       /* Force a default accelerator */
       ptr = it;
       memmove (ptr + 1, ptr, len + 1);
-      *accel = DOWNCASE (0, charptr_emchar (ptr + 1));
+      *accel = DOWNCASE (0, itext_ichar (ptr + 1));
       *ptr = '&';
 
       len++;
@@ -204,7 +204,7 @@
  */
 
 static Lisp_Object
-displayable_menu_item (Lisp_Object gui_item, int bar_p, Emchar *accel)
+displayable_menu_item (Lisp_Object gui_item, int bar_p, Ichar *accel)
 {
   Lisp_Object left, right = Qnil;
 
@@ -336,7 +336,7 @@
       Lisp_Object gui_item = allocate_gui_item ();
       Lisp_Gui_Item *pgui_item = XGUI_ITEM (gui_item);
       struct gcpro gcpro1, gcpro2, gcpro3;
-      Emchar accel;
+      Ichar accel;
       Extbyte *itemext;
 
       GCPRO3 (gui_item, path, *accel_list);
@@ -394,7 +394,7 @@
       Lisp_Object gui_item = gui_parse_item_keywords (item);
       Lisp_Gui_Item *pgui_item = XGUI_ITEM (gui_item);
       struct gcpro gcpro1, gcpro2;
-      Emchar accel;
+      Ichar accel;
       Extbyte *itemext;
 
       GCPRO2 (gui_item, *accel_list);
@@ -672,7 +672,7 @@
 }
 
 int
-mswindows_char_is_accelerator (struct frame *f, Emchar ch)
+mswindows_char_is_accelerator (struct frame *f, Ichar ch)
 {
   Lisp_Object hash = FRAME_MSWINDOWS_MENU_HASH_TABLE (f);