Mercurial > hg > xemacs-beta
diff src/objects-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 | 190b164ddcac |
line wrap: on
line diff
--- a/src/objects-msw.c Thu May 24 06:30:21 2001 +0000 +++ b/src/objects-msw.c Thu May 24 07:51:33 2001 +0000 @@ -1184,7 +1184,8 @@ COLOR_INSTANCE_MSWINDOWS_COLOR (c) = color; return 1; } - maybe_signal_simple_error ("Unrecognized color", name, Qcolor, errb); + maybe_signal_error (Qinvalid_constant, + "Unrecognized color", name, Qcolor, errb); return(0); } @@ -1301,7 +1302,7 @@ if (fields < 0) { - maybe_signal_simple_error ("Invalid font", name, Qfont, errb); + maybe_signal_error (Qinvalid_argument, "Invalid font", name, Qfont, errb); return (0); } @@ -1312,7 +1313,7 @@ } else { - maybe_signal_simple_error ("Must specify a font name", name, Qfont, errb); + maybe_signal_error (Qinvalid_argument, "Must specify a font name", name, Qfont, errb); return (0); } @@ -1344,7 +1345,7 @@ } else { - maybe_signal_simple_error ("Invalid font weight", name, Qfont, errb); + maybe_signal_error (Qinvalid_constant, "Invalid font weight", name, Qfont, errb); return (0); } } @@ -1356,7 +1357,7 @@ logfont.lfItalic = TRUE; else { - maybe_signal_simple_error ("Invalid font weight or style", name, Qfont, errb); + maybe_signal_error (Qinvalid_constant, "Invalid font weight or style", name, Qfont, errb); return (0); } @@ -1371,7 +1372,7 @@ pt = 10; /* #### Should we reject strings that don't specify a size? */ else if ((pt=atoi(points)) == 0) { - maybe_signal_simple_error ("Invalid font pointsize", name, Qfont, errb); + maybe_signal_error (Qinvalid_argument, "Invalid font pointsize", name, Qfont, errb); return (0); } @@ -1401,7 +1402,7 @@ logfont.lfStrikeOut = TRUE; else { - maybe_signal_simple_error ("Invalid font effect", name, Qfont, errb); + maybe_signal_error (Qinvalid_constant, "Invalid font effect", name, Qfont, errb); return (0); } @@ -1413,7 +1414,7 @@ logfont.lfStrikeOut = TRUE; else { - maybe_signal_simple_error ("Invalid font effect", name, + maybe_signal_error (Qinvalid_constant, "Invalid font effect", name, Qfont, errb); return (0); } @@ -1456,7 +1457,7 @@ if (i == countof (charset_map)) /* No matching charset */ { - maybe_signal_simple_error ("Invalid charset", name, Qfont, errb); + maybe_signal_error (Qinvalid_argument, "Invalid charset", name, Qfont, errb); return 0; } @@ -1493,14 +1494,14 @@ } if (NILP (fonttail)) { - maybe_signal_simple_error ("No matching font", name, Qfont, errb); + maybe_signal_error (Qinvalid_argument, "No matching font", name, Qfont, errb); return 0; } } if ((hfont = CreateFontIndirect(&logfont)) == NULL) { - maybe_signal_simple_error ("Couldn't create font", name, Qfont, errb); + maybe_signal_error (Qgui_error, "Couldn't create font", name, Qfont, errb); return 0; } @@ -1519,7 +1520,7 @@ if (!hfont2) { mswindows_finalize_font_instance (f); - maybe_signal_simple_error ("Couldn't map font", name, Qfont, errb); + maybe_signal_error (Qgui_error, "Couldn't map font", name, Qfont, errb); return 0; } GetTextMetrics (hdc, &metrics);