diff src/toolbar-msw.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 abe6d1db359e
children 943eaba38521
line wrap: on
line diff
--- a/src/toolbar-msw.c	Thu May 24 06:30:21 2001 +0000
+++ b/src/toolbar-msw.c	Thu May 24 07:51:33 2001 +0000
@@ -289,8 +289,7 @@
 			    {
 			      xfree (button_tbl);
 			      if (ilist) ImageList_Destroy (ilist);
-			      signal_simple_error ("Couldn't resize pixmap", 
-						   instance);
+			      gui_error ("Couldn't resize pixmap", instance);
 			    }
 			  /* we don't care if the mask fails */
 			  mask = mswindows_create_resized_mask 
@@ -312,8 +311,7 @@
 					nbuttons, nbuttons * 2 )))
 			{
 			  xfree (button_tbl);
-			  signal_simple_error ("Couldn't create image list",
-					       instance);
+			  gui_error ("Couldn't create image list", instance);
 			}
 
 		      /* make the mask actually do something */
@@ -329,7 +327,7 @@
 			{
 			  xfree (button_tbl);
 			  if (ilist) ImageList_Destroy (ilist);
-			  signal_simple_error 
+			  gui_error 
 			    ("couldn't add image to image list", instance);
 			}
 		      /* we're done with these now */
@@ -390,7 +388,7 @@
 	{
 	  xfree (button_tbl);
 	  ImageList_Destroy (ilist);
-	  error ("couldn't create toolbar");
+	  gui_error ("couldn't create toolbar", Qunbound);
 	}
 
       /* finally populate with images */
@@ -398,7 +396,7 @@
 		       (WPARAM)sizeof(TBBUTTON), (LPARAM)0) == -1) 
 	{
 	  mswindows_clear_toolbar (f, pos, 0);
-	  error ("couldn't set button structure size");
+	  gui_error ("couldn't set button structure size", Qunbound);
 	}
 
       if (vert)
@@ -426,7 +424,7 @@
 			(WPARAM)nbuttons, (LPARAM)button_tbl))
 	{
 	  mswindows_clear_toolbar (f, pos, 0);
-	  error ("couldn't add button list to toolbar");
+	  gui_error ("couldn't add button list to toolbar", Qunbound);
 	}
 
       /* vertical toolbars need more rows */
@@ -452,7 +450,7 @@
 		       (LPARAM)ilist) < 0)
 	{
 	  mswindows_clear_toolbar (f, pos, 0);
-	  error ("couldn't add image list to toolbar");
+	  gui_error ("couldn't add image list to toolbar", Qunbound);
 	}
 
       /* now display the window */