Mercurial > hg > xemacs-beta

diff src/toolbar.c @ 563:183866b06e0b

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
[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 0784d089fdc9
children 190b164ddcac
line wrap: on
line diff
--- a/src/toolbar.c	Thu May 24 06:30:21 2001 +0000
+++ b/src/toolbar.c	Thu May 24 07:51:33 2001 +0000
@@ -220,7 +220,7 @@
   if (EQ (position, Qbottom)) return BOTTOM_TOOLBAR;
   if (EQ (position, Qleft))   return LEFT_TOOLBAR;
   if (EQ (position, Qright))  return RIGHT_TOOLBAR;
-  signal_simple_error ("Invalid toolbar position", position);
+  invalid_constant ("Invalid toolbar position", position);
 
   return TOP_TOOLBAR; /* not reached */
 }
@@ -608,7 +608,7 @@
     }
 
   if (!CONSP (toolbar))
-    signal_simple_error ("toolbar description must be a list", toolbar);
+    sferror ("toolbar description must be a list", toolbar);
 
   /* First synchronize any existing buttons. */
   while (!NILP (toolbar) && !NILP (buttons))
@@ -618,7 +618,7 @@
       if (NILP (XCAR (toolbar)))
 	{
 	  if (pushright_seen)
-	    signal_simple_error
+	    sferror
 	      ("more than one partition (nil) in toolbar description",
 	       orig_toolbar);
 	  else
@@ -664,7 +664,7 @@
       if (NILP (XCAR (toolbar)))
 	{
 	  if (pushright_seen)
-	    signal_simple_error
+	    sferror
 	      ("more than one partition (nil) in toolbar description",
 	       orig_toolbar);
 	  else
@@ -942,9 +942,9 @@
 
 DEFINE_SPECIFIER_TYPE (toolbar);
 
-#define CTB_ERROR(msg) do {					\
-  maybe_signal_simple_error (msg, button, Qtoolbar, errb);	\
-  RETURN_SANS_WARNINGS Qnil;					\
+#define CTB_ERROR(msg) do {						    \
+									      maybe_signal_error (Qinvalid_argument, msg, button, Qtoolbar, errb); \
+  RETURN_SANS_WARNINGS Qnil;						    \
 } while (0)
 
 /* Returns Q_style if key was :style, Qt if ok otherwise, Qnil if error. */
@@ -954,8 +954,8 @@
 {
   if (!KEYWORDP (key))
     {
-      maybe_signal_simple_error_2 ("Not a keyword", key, button, Qtoolbar,
-				   errb);
+      maybe_signal_error_2 (Qinvalid_argument, "Not a keyword", key, button,
+				 Qtoolbar, errb);
       return Qnil;
     }
 
@@ -1114,18 +1114,19 @@
     return;
 
   if (!CONSP (instantiator))
-    signal_simple_error ("Toolbar spec must be list or nil", instantiator);
+    sferror ("Toolbar spec must be list or nil", instantiator);
 
   for (rest = instantiator; !NILP (rest); rest = XCDR (rest))
     {
       if (!CONSP (rest))
-	signal_simple_error ("Bad list in toolbar spec", instantiator);
+	sferror ("Bad list in toolbar spec", instantiator);
 
       if (NILP (XCAR (rest)))
 	{
 	  if (pushright_seen)
-	    error
-	      ("More than one partition (nil) in instantiator description");
+  	    sferror
+	      ("More than one partition (nil) in instantiator description",
+	       instantiator);
 	  else
 	    pushright_seen = 1;
 	}
@@ -1253,14 +1254,14 @@
 {
   INIT_LRECORD_IMPLEMENTATION (toolbar_button);
 
-  defsymbol (&Qtoolbar_buttonp, "toolbar-button-p");
-  defsymbol (&Q2D, "2D");
-  defsymbol (&Q3D, "3D");
-  defsymbol (&Q2d, "2d");
-  defsymbol (&Q3d, "3d");
-  defsymbol (&Q_size, ":size");	Fset (Q_size, Q_size);
+  DEFSYMBOL_MULTIWORD_PREDICATE (Qtoolbar_buttonp);
+  DEFSYMBOL (Q2D);
+  DEFSYMBOL (Q3D);
+  DEFSYMBOL (Q2d);
+  DEFSYMBOL (Q3d);
+  DEFKEYWORD (Q_size);
 
-  defsymbol (&Qinit_toolbar_from_resources, "init-toolbar-from-resources");
+  DEFSYMBOL (Qinit_toolbar_from_resources);
   DEFSUBR (Ftoolbar_button_p);
   DEFSUBR (Ftoolbar_button_callback);
   DEFSUBR (Ftoolbar_button_help_string);