X-Git-Url: http://git.chise.org/gitweb/?p=chise%2Fxemacs-chise.git.1;a=blobdiff_plain;f=src%2Fdialog-x.c;h=3d1acc356ce915b09f71ab41c0b30b8305fc45e0;hp=bd57d0d659b8a7e13286c6c1db644899000da10d;hb=a1655b870904de973c366d85ebdc8adde4ef5e1e;hpb=c855f9c824a0fc23e52e92d65ec8a34bd51cddd7

diff --git a/src/dialog-x.c b/src/dialog-x.c
index bd57d0d..3d1acc3 100644
--- a/src/dialog-x.c
+++ b/src/dialog-x.c
@@ -51,10 +51,14 @@ maybe_run_dbox_text_callback (LWLIB_ID id)
       Lisp_Object text_field_callback;
       char *text_field_value = wv->value;
       VOID_TO_LISP (text_field_callback, wv->call_data);
+      text_field_callback = XCAR (XCDR (text_field_callback));
       if (text_field_value)
 	{
-	  void *tmp = LISP_TO_VOID (list2 (text_field_callback,
-                                           build_string (text_field_value)));
+	  void *tmp =
+	    LISP_TO_VOID (cons3 (Qnil,
+				 list2 (text_field_callback,
+					build_string (text_field_value)),
+				 Qnil));
 	  popup_selection_callback (0, id, (XtPointer) tmp);
 	}
     }
@@ -166,7 +170,8 @@ dbox_descriptor_to_widget_value (Lisp_Object desc)
       wv = xmalloc_widget_value ();
 
       gui_item = gui_parse_item_keywords (button);
-      if (!button_item_to_widget_value (gui_item, wv, allow_text_p, 1))
+      if (!button_item_to_widget_value (Qdialog,
+					gui_item, wv, allow_text_p, 1, 0))
 	{
 	  free_widget_value_tree (wv);
 	  continue;