diff src/dialog-x.c @ 406:b8cc9ab3f761 r21-2-33

Import from CVS: tag r21-2-33
author cvs
date Mon, 13 Aug 2007 11:17:09 +0200
parents 74fd4e045ea6
children 697ef44129c6
line wrap: on
line diff
--- a/src/dialog-x.c	Mon Aug 13 11:16:09 2007 +0200
+++ b/src/dialog-x.c	Mon Aug 13 11:17:09 2007 +0200
@@ -51,10 +51,14 @@
       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 @@
       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;