comparison src/gui-x.c @ 440:8de8e3f6228a r21-2-28

Import from CVS: tag r21-2-28
author cvs
date Mon, 13 Aug 2007 11:33:38 +0200
parents 080151679be2
children abe6d1db359e
comparison
equal deleted inserted replaced
439:357dd071b03c 440:8de8e3f6228a
311 int allow_text_field_p, int no_keys_p) 311 int allow_text_field_p, int no_keys_p)
312 { 312 {
313 /* !!#### This function has not been Mule-ized */ 313 /* !!#### This function has not been Mule-ized */
314 /* This function cannot GC because gc_currently_forbidden is set when 314 /* This function cannot GC because gc_currently_forbidden is set when
315 it's called */ 315 it's called */
316 struct Lisp_Gui_Item* pgui = 0; 316 Lisp_Gui_Item* pgui = 0;
317 317
318 /* degenerate case */ 318 /* degenerate case */
319 if (STRINGP (gui_item)) 319 if (STRINGP (gui_item))
320 { 320 {
321 wv->type = TEXT_TYPE; 321 wv->type = TEXT_TYPE;
356 { 356 {
357 suffix2 = Feval (pgui->suffix); 357 suffix2 = Feval (pgui->suffix);
358 CHECK_STRING (suffix2); 358 CHECK_STRING (suffix2);
359 } 359 }
360 360
361 GET_C_STRING_FILENAME_DATA_ALLOCA (suffix2, const_bogosity); 361 TO_EXTERNAL_FORMAT (LISP_STRING, suffix2,
362 C_STRING_ALLOCA, const_bogosity,
363 Qfile_name);
362 wv->value = (char *) const_bogosity; 364 wv->value = (char *) const_bogosity;
363 wv->value = xstrdup (wv->value); 365 wv->value = xstrdup (wv->value);
364 } 366 }
365 367
366 wv_set_evalable_slot (wv->enabled, pgui->active); 368 wv_set_evalable_slot (wv->enabled, pgui->active);
464 if (!CONSP (items)) 466 if (!CONSP (items))
465 { 467 {
466 wv = xmalloc_widget_value(); 468 wv = xmalloc_widget_value();
467 if (parent) 469 if (parent)
468 parent->contents = wv; 470 parent->contents = wv;
469 else 471 else
470 prev->next = wv; 472 prev->next = wv;
471 if (!button_item_to_widget_value (items, wv, 0, 1)) 473 if (!button_item_to_widget_value (items, wv, 0, 1))
472 { 474 {
473 free_widget_value_tree (wv); 475 free_widget_value_tree (wv);
474 if (parent) 476 if (parent)
475 parent->contents = 0; 477 parent->contents = 0;
476 else 478 else
477 prev->next = 0; 479 prev->next = 0;
478 } 480 }
479 else 481 else
480 { 482 {
481 wv->value = xstrdup (wv->name); /* what a mess... */ 483 wv->value = xstrdup (wv->name); /* what a mess... */
482 } 484 }
483 } 485 }
484 else 486 else