comparison src/gui-x.c @ 563:183866b06e0b

[xemacs-hg @ 2001-05-24 07:50:48 by ben] Makefile.in.in, abbrev.c, alloc.c, buffer.c, bytecode.c, callint.c, callproc.c, casetab.c, chartab.c, cmdloop.c, cmds.c, console-msw.c, console-msw.h, console-stream.c, console-tty.c, console-x.c, console.c, data.c, database.c, debug.c, device-gtk.c, device-msw.c, device-tty.c, device-x.c, device.c, dialog-gtk.c, dialog-msw.c, dialog-x.c, dialog.c, dired-msw.c, dired.c, doc.c, doprnt.c, dragdrop.c, editfns.c, eldap.c, eldap.h, elhash.c, emacs-widget-accessors.c, emacs.c, emodules.c, esd.c, eval.c, event-Xt.c, event-gtk.c, event-msw.c, event-stream.c, events.c, extents.c, faces.c, file-coding.c, fileio.c, filelock.c, floatfns.c, fns.c, font-lock.c, frame-gtk.c, frame-x.c, frame.c, general-slots.h, glade.c, glyphs-gtk.c, glyphs-msw.c, glyphs-widget.c, glyphs-x.c, glyphs.c, glyphs.h, gpmevent.c, gui-gtk.c, gui-x.c, gui.c, gutter.c, hpplay.c, indent.c, input-method-xlib.c, insdel.c, intl.c, keymap.c, libsst.c, libsst.h, linuxplay.c, lisp.h, lread.c, lstream.c, lstream.h, macros.c, marker.c, md5.c, menubar-gtk.c, menubar-msw.c, menubar-x.c, menubar.c, minibuf.c, miscplay.c, miscplay.h, mule-ccl.c, mule-charset.c, mule-wnnfns.c, mule.c, nas.c, ntplay.c, ntproc.c, objects-gtk.c, objects-msw.c, objects-x.c, objects.c, postgresql.c, print.c, process-nt.c, process-unix.c, process.c, ralloc.c, rangetab.c, redisplay.c, scrollbar.c, search.c, select-gtk.c, select-x.c, select.c, sgiplay.c, sheap.c, sound.c, specifier.c, sunplay.c, symbols.c, symeval.h, symsinit.h, syntax.c, sysdep.c, toolbar-msw.c, toolbar.c, tooltalk.c, ui-byhand.c, ui-gtk.c, undo.c, unexaix.c, unexapollo.c, unexconvex.c, unexec.c, widget.c, win32.c, window.c: -- defsymbol -> DEFSYMBOL. -- add an error type to all errors. -- eliminate the error functions in eval.c that let you just use Qerror as the type. -- redo the error API to be more consistent, sensibly named, and easier to use. -- redo the error hierarchy somewhat. create new errors: structure-formation-error, gui-error, invalid-constant, stack-overflow, out-of-memory, process-error, network-error, sound-error, printing-unreadable-object, base64-conversion- error; coding-system-error renamed to text-conversion error; some others. -- fix Mule problems in error strings in emodules.c, tooltalk.c. -- fix error handling in mswin open-network-stream. -- Mule-ize all sound files and clean up the headers. -- nativesound.h -> sound.h and used for all sound files. -- move some shared stuff into glyphs-shared.c: first attempt at eliminating some of the massive GTK code duplication. xemacs.mak: add glyphs-shared.c. xemacs-faq.texi: document how to debug X errors subr.el: fix doc string to reflect reality
author ben
date Thu, 24 May 2001 07:51:33 +0000
parents e9a3f8b4de53
children b39c14581166
comparison
equal deleted inserted replaced
562:c775bd016b32 563:183866b06e0b
403 else 403 else
404 LISP_STRING_TO_EXTERNAL_MALLOC (gui_item, wv->name, Qlwlib_encoding); 404 LISP_STRING_TO_EXTERNAL_MALLOC (gui_item, wv->name, Qlwlib_encoding);
405 return 1; 405 return 1;
406 } 406 }
407 else if (!GUI_ITEMP (gui_item)) 407 else if (!GUI_ITEMP (gui_item))
408 syntax_error ("need a string or a gui_item here", gui_item); 408 invalid_argument ("need a string or a gui_item here", gui_item);
409 409
410 pgui = XGUI_ITEM (gui_item); 410 pgui = XGUI_ITEM (gui_item);
411 411
412 if (!NILP (pgui->filter)) 412 if (!NILP (pgui->filter))
413 syntax_error (":filter keyword not permitted on leaf nodes", gui_item); 413 sferror (":filter keyword not permitted on leaf nodes", gui_item);
414 414
415 #ifdef HAVE_MENUBARS 415 #ifdef HAVE_MENUBARS
416 if (menu_entry_p && !gui_item_included_p (gui_item, Vmenubar_configuration)) 416 if (menu_entry_p && !gui_item_included_p (gui_item, Vmenubar_configuration))
417 { 417 {
418 /* the include specification says to ignore this item. */ 418 /* the include specification says to ignore this item. */
531 wv->value = wv->name; 531 wv->value = wv->name;
532 wv->name = "value"; 532 wv->name = "value";
533 #endif 533 #endif
534 } 534 }
535 else 535 else
536 syntax_error_2 ("Unknown style", pgui->style, gui_item); 536 invalid_constant_2 ("Unknown style", pgui->style, gui_item);
537 537
538 if (!allow_text_field_p && (wv->type == TEXT_TYPE)) 538 if (!allow_text_field_p && (wv->type == TEXT_TYPE))
539 syntax_error ("Text field not allowed in this context", gui_item); 539 sferror ("Text field not allowed in this context", gui_item);
540 540
541 if (!NILP (pgui->selected) && EQ (pgui->style, Qtext)) 541 if (!NILP (pgui->selected) && EQ (pgui->style, Qtext))
542 syntax_error 542 sferror
543 (":selected only makes sense with :style toggle, radio or button", 543 (":selected only makes sense with :style toggle, radio or button",
544 gui_item); 544 gui_item);
545 return 1; 545 return 1;
546 } 546 }
547 547
582 } 582 }
583 else 583 else
584 { 584 {
585 /* first one is the parent */ 585 /* first one is the parent */
586 if (CONSP (XCAR (items))) 586 if (CONSP (XCAR (items)))
587 syntax_error ("parent item must not be a list", XCAR (items)); 587 sferror ("parent item must not be a list", XCAR (items));
588 588
589 if (parent) 589 if (parent)
590 wv = gui_items_to_widget_values_1 (gui_object_instance, 590 wv = gui_items_to_widget_values_1 (gui_object_instance,
591 XCAR (items), parent, 0, accel_p); 591 XCAR (items), parent, 0, accel_p);
592 else 592 else
629 widget_value *control = 0, *tmp = 0; 629 widget_value *control = 0, *tmp = 0;
630 int count = specpdl_depth (); 630 int count = specpdl_depth ();
631 Lisp_Object wv_closure; 631 Lisp_Object wv_closure;
632 632
633 if (NILP (items)) 633 if (NILP (items))
634 syntax_error ("must have some items", items); 634 sferror ("must have some items", items);
635 635
636 /* Inhibit GC during this conversion. The reasons for this are 636 /* Inhibit GC during this conversion. The reasons for this are
637 the same as in menu_item_descriptor_to_widget_value(); see 637 the same as in menu_item_descriptor_to_widget_value(); see
638 the large comment above that function. */ 638 the large comment above that function. */
639 record_unwind_protect (restore_gc_inhibit, 639 record_unwind_protect (restore_gc_inhibit,