comparison src/menubar-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 1ccc32a20af4
children fdefd0186b75
comparison
equal deleted inserted replaced
562:c775bd016b32 563:183866b06e0b
171 while (key = Fcar (desc), KEYWORDP (key)) 171 while (key = Fcar (desc), KEYWORDP (key))
172 { 172 {
173 Lisp_Object cascade = desc; 173 Lisp_Object cascade = desc;
174 desc = Fcdr (desc); 174 desc = Fcdr (desc);
175 if (NILP (desc)) 175 if (NILP (desc))
176 syntax_error ("Keyword in menu lacks a value", cascade); 176 sferror ("Keyword in menu lacks a value", cascade);
177 val = Fcar (desc); 177 val = Fcar (desc);
178 desc = Fcdr (desc); 178 desc = Fcdr (desc);
179 if (EQ (key, Q_included)) 179 if (EQ (key, Q_included))
180 include_p = val, included_spec = 1; 180 include_p = val, included_spec = 1;
181 else if (EQ (key, Q_config)) 181 else if (EQ (key, Q_config))
188 { 188 {
189 if ( SYMBOLP (val) 189 if ( SYMBOLP (val)
190 || CHARP (val)) 190 || CHARP (val))
191 wv->accel = LISP_TO_VOID (val); 191 wv->accel = LISP_TO_VOID (val);
192 else 192 else
193 syntax_error ("bad keyboard accelerator", val); 193 invalid_argument ("bad keyboard accelerator", val);
194 } 194 }
195 else if (EQ (key, Q_label)) 195 else if (EQ (key, Q_label))
196 { 196 {
197 /* implement in 21.2 */ 197 /* implement in 21.2 */
198 } 198 }
199 else 199 else
200 syntax_error ("Unknown menu cascade keyword", cascade); 200 invalid_argument ("Unknown menu cascade keyword", cascade);
201 } 201 }
202 202
203 if ((!NILP (config_tag) 203 if ((!NILP (config_tag)
204 && NILP (Fmemq (config_tag, Vmenubar_configuration))) 204 && NILP (Fmemq (config_tag, Vmenubar_configuration)))
205 || (included_spec && NILP (Feval (include_p)))) 205 || (included_spec && NILP (Feval (include_p))))
282 wv->type = CASCADE_TYPE; /* Well, nothing else seems to fit and 282 wv->type = CASCADE_TYPE; /* Well, nothing else seems to fit and
283 this is ignored anyway... */ 283 this is ignored anyway... */
284 } 284 }
285 else 285 else
286 { 286 {
287 syntax_error ("Menu name (first element) must be a string", desc); 287 sferror ("Menu name (first element) must be a string", desc);
288 } 288 }
289 289
290 if (deep_p || menubar_root_p) 290 if (deep_p || menubar_root_p)
291 { 291 {
292 widget_value *next; 292 widget_value *next;
294 { 294 {
295 Lisp_Object child = Fcar (desc); 295 Lisp_Object child = Fcar (desc);
296 if (menubar_root_p && NILP (child)) /* the partition */ 296 if (menubar_root_p && NILP (child)) /* the partition */
297 { 297 {
298 if (partition_seen) 298 if (partition_seen)
299 syntax_error 299 sferror
300 ("More than one partition (nil) in menubar description", 300 ("More than one partition (nil) in menubar description",
301 desc); 301 desc);
302 partition_seen = 1; 302 partition_seen = 1;
303 next = xmalloc_widget_value (); 303 next = xmalloc_widget_value ();
304 next->type = PUSHRIGHT_TYPE; 304 next->type = PUSHRIGHT_TYPE;
319 } 319 }
320 if (deep_p && !wv->contents) 320 if (deep_p && !wv->contents)
321 wv = NULL; 321 wv = NULL;
322 } 322 }
323 else if (NILP (desc)) 323 else if (NILP (desc))
324 syntax_error ("nil may not appear in menu descriptions", desc); 324 sferror ("nil may not appear in menu descriptions", desc);
325 else 325 else
326 syntax_error ("Unrecognized menu descriptor", desc); 326 sferror ("Unrecognized menu descriptor", desc);
327 327
328 menu_item_done: 328 menu_item_done:
329 329
330 if (wv) 330 if (wv)
331 { 331 {
812 menu_desc = Fsymbol_value (menu_desc); 812 menu_desc = Fsymbol_value (menu_desc);
813 CHECK_CONS (menu_desc); 813 CHECK_CONS (menu_desc);
814 CHECK_STRING (XCAR (menu_desc)); 814 CHECK_STRING (XCAR (menu_desc));
815 data = menu_item_descriptor_to_widget_value (menu_desc, POPUP_TYPE, 1, 1); 815 data = menu_item_descriptor_to_widget_value (menu_desc, POPUP_TYPE, 1, 1);
816 816
817 if (! data) error ("no menu"); 817 if (! data) signal_error (Qgui_error, "no menu", Qunbound);
818 818
819 menu_id = new_lwlib_id (); 819 menu_id = new_lwlib_id ();
820 menu = lw_create_widget ("popup", "popup" /* data->name */, menu_id, data, 820 menu = lw_create_widget ("popup", "popup" /* data->name */, menu_id, data,
821 parent, 1, 0, 821 parent, 1, 0,
822 popup_menu_selection_callback, 822 popup_menu_selection_callback,
1330 struct frame *f = XFRAME (CONSOLE_SELECTED_FRAME (con)); 1330 struct frame *f = XFRAME (CONSOLE_SELECTED_FRAME (con));
1331 LWLIB_ID id; 1331 LWLIB_ID id;
1332 widget_value *val; 1332 widget_value *val;
1333 1333
1334 if (NILP (f->menubar_data)) 1334 if (NILP (f->menubar_data))
1335 error ("Frame has no menubar."); 1335 invalid_argument ("Frame has no menubar", Qunbound);
1336 1336
1337 id = XPOPUP_DATA (f->menubar_data)->id; 1337 id = XPOPUP_DATA (f->menubar_data)->id;
1338 val = lw_get_all_values (id); 1338 val = lw_get_all_values (id);
1339 val = val->contents; 1339 val = val->contents;
1340 lw_set_menu (FRAME_X_MENUBAR_WIDGET (f), val); 1340 lw_set_menu (FRAME_X_MENUBAR_WIDGET (f), val);