Mercurial > hg > xemacs-beta

diff src/glyphs-x.c @ 4834:b3ea9c582280

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Use new cygwin_conv_path API with Cygwin 1.7 for converting names between Win32 and POSIX, UTF-8-aware, with attendant changes elsewhere
author Ben Wing <ben@xemacs.org>
date Tue, 12 Jan 2010 01:38:04 -0600
parents 5460287a3327
children a6c778975d7d 8b63e21b0436
line wrap: on
line diff
--- a/src/glyphs-x.c	Sun Jan 10 01:06:15 2010 -0600
+++ b/src/glyphs-x.c	Tue Jan 12 01:38:04 2010 -0600
@@ -2201,7 +2201,7 @@
     {
       Extbyte* str;
       Lisp_Object val = IMAGE_INSTANCE_WIDGET_TEXT (p);
-      LISP_STRING_TO_EXTERNAL (val, str, Qnative);
+      LISP_STRING_TO_EXTERNAL (val, str, Qlwlib_encoding);
       wv->value = str;
     }
 
@@ -2469,7 +2469,8 @@
   IMAGE_INSTANCE_TYPE (ii) = IMAGE_WIDGET;
 
   if (!NILP (IMAGE_INSTANCE_WIDGET_TEXT (ii)))
-    LISP_STRING_TO_EXTERNAL (IMAGE_INSTANCE_WIDGET_TEXT (ii), nm, Qnative);
+    LISP_STRING_TO_EXTERNAL (IMAGE_INSTANCE_WIDGET_TEXT (ii), nm,
+			     Qlwlib_encoding);
 
   ii->data = xnew_and_zero (struct x_subwindow_data);
 
@@ -2560,7 +2561,7 @@
   if (EQ (prop, Q_text))
     {
       widget_value* wv = lw_get_all_values (IMAGE_INSTANCE_X_WIDGET_LWID (ii));
-      return build_ext_string (wv->value, Qnative);
+      return build_ext_string (wv->value, Qlwlib_encoding);
     }
   return Qunbound;
 }
@@ -2776,7 +2777,7 @@
 		  Widget* children;
 
 		  LISP_STRING_TO_EXTERNAL (XGUI_ITEM (XCAR (rest))->name,
-					   name, Qnative);
+					   name, Qlwlib_encoding);
 		  /* The name may contain a `.' which confuses
 		     XtNameToWidget, so we do it ourselves. */
 		  children =