Mercurial > hg > xemacs-beta

diff src/menubar-gtk.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 02339d4ebed4
line wrap: on
line diff
--- a/src/menubar-gtk.c	Thu May 24 06:30:21 2001 +0000
+++ b/src/menubar-gtk.c	Thu May 24 07:51:33 2001 +0000
@@ -439,7 +439,7 @@
 	  Lisp_Object cascade = desc;
 	  desc = Fcdr (desc);
 	  if (NILP (desc))
-	    signal_simple_error ("keyword in menu lacks a value",
+	    sferror ("keyword in menu lacks a value",
 				 cascade);
 	  val = Fcar (desc);
 	  desc = Fcdr (desc);
@@ -458,7 +458,7 @@
 		   || CHARP (val))
 		wv->accel = LISP_TO_VOID (val);
 	      else
-		signal_simple_error ("bad keyboard accelerator", val);
+		invalid_argument ("bad keyboard accelerator", val);
 #endif
 	    }
 	  else if (EQ (key, Q_label))
@@ -466,7 +466,7 @@
 	      /* implement in 21.2 */
 	    }
 	  else
-	    signal_simple_error ("unknown menu cascade keyword", cascade);
+	    invalid_argument ("unknown menu cascade keyword", cascade);
 	}
 
       gtk_object_set_data (GTK_OBJECT (menu_item), XEMACS_MENU_DESCR_TAG, LISP_TO_VOID (desc));
@@ -486,7 +486,7 @@
     }
   else
     {
-      signal_simple_error ("menu name (first element) must be a string",
+      invalid_argument ("menu name (first element) must be a string",
 			   desc);
     }
 
@@ -612,7 +612,7 @@
       GtkWidget *widget = NULL;
 
       if (length < 2)
-	signal_simple_error ("button descriptors must be at least 2 long", descr);
+	sferror ("button descriptors must be at least 2 long", descr);
 
       /* length 2:		[ "name" callback ]
 	 length 3:		[ "name" callback active-p ]
@@ -636,7 +636,7 @@
 	  /* the new way */
 	  int i;
 	  if (length & 1)
-	    signal_simple_error (
+	    sferror (
 				 "button descriptor has an odd number of keywords and values",
 				 descr);
 
@@ -647,7 +647,7 @@
 	      Lisp_Object key = contents [i++];
 	      Lisp_Object val = contents [i++];
 	      if (!KEYWORDP (key))
-		signal_simple_error_2 ("not a keyword", key, descr);
+		invalid_argument_2 ("not a keyword", key, descr);
 
 	      if      (EQ (key, Q_active))   active_p   = val;
 	      else if (EQ (key, Q_suffix))   suffix     = val;
@@ -663,12 +663,12 @@
 		  if ( SYMBOLP (val) || CHARP (val))
 		    accel = val;
 		  else
-		    signal_simple_error ("bad keyboard accelerator", val);
+		    invalid_argument ("bad keyboard accelerator", val);
 		}
 	      else if (EQ (key, Q_filter))
-		signal_simple_error(":filter keyword not permitted on leaf nodes", descr);
+		sferror(":filter keyword not permitted on leaf nodes", descr);
 	      else
-		signal_simple_error_2 ("unknown menu item keyword", key, descr);
+		invalid_argument_2 ("unknown menu item keyword", key, descr);
 	    }
 	}
 
@@ -809,7 +809,7 @@
 	}
       else
 	{
-	  signal_simple_error_2 ("unknown style", style, descr);
+	  invalid_argument_2 ("unknown style", style, descr);
 	}
 
       gtk_widget_set_sensitive (widget, ! NILP (active_p));