Mercurial > hg > xemacs-beta

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

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Import from CVS: tag r21-2-33
author cvs
date Mon, 13 Aug 2007 11:17:09 +0200
parents 74fd4e045ea6
children 697ef44129c6
comparison
equal deleted inserted replaced
405:0e08f63c74d2 406:b8cc9ab3f761
49 if (got_some) 49 if (got_some)
50 { 50 {
51 Lisp_Object text_field_callback; 51 Lisp_Object text_field_callback;
52 char *text_field_value = wv->value; 52 char *text_field_value = wv->value;
53 VOID_TO_LISP (text_field_callback, wv->call_data); 53 VOID_TO_LISP (text_field_callback, wv->call_data);
54 text_field_callback = XCAR (XCDR (text_field_callback));
54 if (text_field_value) 55 if (text_field_value)
55 { 56 {
56 void *tmp = LISP_TO_VOID (list2 (text_field_callback, 57 void *tmp =
57 build_string (text_field_value))); 58 LISP_TO_VOID (cons3 (Qnil,
59 list2 (text_field_callback,
60 build_string (text_field_value)),
61 Qnil));
58 popup_selection_callback (0, id, (XtPointer) tmp); 62 popup_selection_callback (0, id, (XtPointer) tmp);
59 } 63 }
60 } 64 }
61 /* This code tried to optimize, newing/freeing. This is generally 65 /* This code tried to optimize, newing/freeing. This is generally
62 unsafe so we will alwats strdup and always use 66 unsafe so we will alwats strdup and always use
164 } 168 }
165 CHECK_VECTOR (button); 169 CHECK_VECTOR (button);
166 wv = xmalloc_widget_value (); 170 wv = xmalloc_widget_value ();
167 171
168 gui_item = gui_parse_item_keywords (button); 172 gui_item = gui_parse_item_keywords (button);
169 if (!button_item_to_widget_value (gui_item, wv, allow_text_p, 1)) 173 if (!button_item_to_widget_value (Qdialog,
174 gui_item, wv, allow_text_p, 1, 0))
170 { 175 {
171 free_widget_value_tree (wv); 176 free_widget_value_tree (wv);
172 continue; 177 continue;
173 } 178 }
174 179