X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=src%2Fgui-x.c;h=1ebd55ae97f0379086fed9a49ac2433fcc713136;hb=3d47edc57fc48c0f387e1301903a14e9163e74b7;hp=7a0e382ba314c4298e6e65341d1f1a16db953f48;hpb=59eec5f21669e81977b5b1fe9bf717cab49cf7fb;p=chise%2Fxemacs-chise.git.1

diff --git a/src/gui-x.c b/src/gui-x.c
index 7a0e382..1ebd55a 100644
--- a/src/gui-x.c
+++ b/src/gui-x.c
@@ -207,7 +207,10 @@ free_popup_widget_value_tree (widget_value *wv)
 }
 
 /* The following is actually called from somewhere within XtDispatchEvent(),
-   called from XtAppProcessEvent() in event-Xt.c */
+   called from XtAppProcessEvent() in event-Xt.c
+
+   Callback function for widgets and menus.
+ */
 
 void
 popup_selection_callback (Widget widget, LWLIB_ID ignored_id,
@@ -289,7 +292,7 @@ popup_selection_callback (Widget widget, LWLIB_ID ignored_id,
     }
 
   /* This is the timestamp used for asserting focus so we need to get an
-     up-to-date value event if no events has been dispatched to emacs
+     up-to-date value event if no events have been dispatched to emacs
      */
 #if defined(HAVE_MENUBARS)
   DEVICE_X_MOUSE_TIMESTAMP (d) = x_focus_timestamp_really_sucks_fix_me_better;
@@ -489,11 +492,14 @@ button_item_to_widget_value (Lisp_Object gui_object_instance,
   if (NILP (pgui->style))
     {
       Bufbyte *intname;
+      Bytecount intlen;
       /* If the callback is nil, treat this item like unselectable text.
 	 This way, dashes will show up as a separator. */
       if (!wv->enabled)
 	wv->type = BUTTON_TYPE;
-      EXTERNAL_TO_C_STRING (wv->name, intname, Qlwlib_encoding);
+      TO_INTERNAL_FORMAT (C_STRING, wv->name,
+			  ALLOCA, (intname, intlen),
+			  Qlwlib_encoding);
       if (separator_string_p (intname))
 	{
 	  wv->type = SEPARATOR_TYPE;