Mercurial > hg > xemacs-beta

comparison 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
comparison
equal deleted inserted replaced
4833:4dd2389173fc 4834:b3ea9c582280
2199 /* Possibly update the text. */ 2199 /* Possibly update the text. */
2200 if (IMAGE_INSTANCE_TEXT_CHANGED (p)) 2200 if (IMAGE_INSTANCE_TEXT_CHANGED (p))
2201 { 2201 {
2202 Extbyte* str; 2202 Extbyte* str;
2203 Lisp_Object val = IMAGE_INSTANCE_WIDGET_TEXT (p); 2203 Lisp_Object val = IMAGE_INSTANCE_WIDGET_TEXT (p);
2204 LISP_STRING_TO_EXTERNAL (val, str, Qnative); 2204 LISP_STRING_TO_EXTERNAL (val, str, Qlwlib_encoding);
2205 wv->value = str; 2205 wv->value = str;
2206 } 2206 }
2207 2207
2208 /* Possibly update the size. */ 2208 /* Possibly update the size. */
2209 if (IMAGE_INSTANCE_SIZE_CHANGED (p) 2209 if (IMAGE_INSTANCE_SIZE_CHANGED (p)
2467 instantiation for a widget. But we can go ahead and do it without 2467 instantiation for a widget. But we can go ahead and do it without
2468 checking because there is always a generic instantiator. */ 2468 checking because there is always a generic instantiator. */
2469 IMAGE_INSTANCE_TYPE (ii) = IMAGE_WIDGET; 2469 IMAGE_INSTANCE_TYPE (ii) = IMAGE_WIDGET;
2470 2470
2471 if (!NILP (IMAGE_INSTANCE_WIDGET_TEXT (ii))) 2471 if (!NILP (IMAGE_INSTANCE_WIDGET_TEXT (ii)))
2472 LISP_STRING_TO_EXTERNAL (IMAGE_INSTANCE_WIDGET_TEXT (ii), nm, Qnative); 2472 LISP_STRING_TO_EXTERNAL (IMAGE_INSTANCE_WIDGET_TEXT (ii), nm,
2473 Qlwlib_encoding);
2473 2474
2474 ii->data = xnew_and_zero (struct x_subwindow_data); 2475 ii->data = xnew_and_zero (struct x_subwindow_data);
2475 2476
2476 /* Create a clip window to contain the subwidget. Incredibly the 2477 /* Create a clip window to contain the subwidget. Incredibly the
2477 XEmacs manager seems to be the most appropriate widget for 2478 XEmacs manager seems to be the most appropriate widget for
2558 Lisp_Image_Instance *ii = XIMAGE_INSTANCE (image_instance); 2559 Lisp_Image_Instance *ii = XIMAGE_INSTANCE (image_instance);
2559 /* get the text from a control */ 2560 /* get the text from a control */
2560 if (EQ (prop, Q_text)) 2561 if (EQ (prop, Q_text))
2561 { 2562 {
2562 widget_value* wv = lw_get_all_values (IMAGE_INSTANCE_X_WIDGET_LWID (ii)); 2563 widget_value* wv = lw_get_all_values (IMAGE_INSTANCE_X_WIDGET_LWID (ii));
2563 return build_ext_string (wv->value, Qnative); 2564 return build_ext_string (wv->value, Qlwlib_encoding);
2564 } 2565 }
2565 return Qunbound; 2566 return Qunbound;
2566 } 2567 }
2567 2568
2568 /* Instantiate a layout control for putting other widgets in. */ 2569 /* Instantiate a layout control for putting other widgets in. */
2774 char* name; 2775 char* name;
2775 unsigned int num_children, i; 2776 unsigned int num_children, i;
2776 Widget* children; 2777 Widget* children;
2777 2778
2778 LISP_STRING_TO_EXTERNAL (XGUI_ITEM (XCAR (rest))->name, 2779 LISP_STRING_TO_EXTERNAL (XGUI_ITEM (XCAR (rest))->name,
2779 name, Qnative); 2780 name, Qlwlib_encoding);
2780 /* The name may contain a `.' which confuses 2781 /* The name may contain a `.' which confuses
2781 XtNameToWidget, so we do it ourselves. */ 2782 XtNameToWidget, so we do it ourselves. */
2782 children = 2783 children =
2783 XtCompositeChildren (IMAGE_INSTANCE_X_WIDGET_ID (ii), 2784 XtCompositeChildren (IMAGE_INSTANCE_X_WIDGET_ID (ii),
2784 &num_children); 2785 &num_children);