comparison 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
comparison
equal deleted inserted replaced
562:c775bd016b32 563:183866b06e0b
287 if (! (bitmap = mswindows_create_resized_bitmap 287 if (! (bitmap = mswindows_create_resized_bitmap
288 (p, f, bmwidth, bmheight))) 288 (p, f, bmwidth, bmheight)))
289 { 289 {
290 xfree (button_tbl); 290 xfree (button_tbl);
291 if (ilist) ImageList_Destroy (ilist); 291 if (ilist) ImageList_Destroy (ilist);
292 signal_simple_error ("Couldn't resize pixmap", 292 gui_error ("Couldn't resize pixmap", instance);
293 instance);
294 } 293 }
295 /* we don't care if the mask fails */ 294 /* we don't care if the mask fails */
296 mask = mswindows_create_resized_mask 295 mask = mswindows_create_resized_mask
297 (p, f, bmwidth, bmheight); 296 (p, f, bmwidth, bmheight);
298 } 297 }
310 (IMAGE_INSTANCE_MSWINDOWS_MASK (p) 309 (IMAGE_INSTANCE_MSWINDOWS_MASK (p)
311 ? ILC_MASK : 0) | ILC_COLOR24, 310 ? ILC_MASK : 0) | ILC_COLOR24,
312 nbuttons, nbuttons * 2 ))) 311 nbuttons, nbuttons * 2 )))
313 { 312 {
314 xfree (button_tbl); 313 xfree (button_tbl);
315 signal_simple_error ("Couldn't create image list", 314 gui_error ("Couldn't create image list", instance);
316 instance);
317 } 315 }
318 316
319 /* make the mask actually do something */ 317 /* make the mask actually do something */
320 ImageList_SetBkColor (ilist, CLR_NONE); 318 ImageList_SetBkColor (ilist, CLR_NONE);
321 /* add a bitmap to the list */ 319 /* add a bitmap to the list */
327 mask ? mask 325 mask ? mask
328 : IMAGE_INSTANCE_MSWINDOWS_MASK (p))) < 0) 326 : IMAGE_INSTANCE_MSWINDOWS_MASK (p))) < 0)
329 { 327 {
330 xfree (button_tbl); 328 xfree (button_tbl);
331 if (ilist) ImageList_Destroy (ilist); 329 if (ilist) ImageList_Destroy (ilist);
332 signal_simple_error 330 gui_error
333 ("couldn't add image to image list", instance); 331 ("couldn't add image to image list", instance);
334 } 332 }
335 /* we're done with these now */ 333 /* we're done with these now */
336 DeleteObject (bitmap); 334 DeleteObject (bitmap);
337 DeleteObject (mask); 335 DeleteObject (mask);
388 NULL, 386 NULL,
389 NULL))==NULL) 387 NULL))==NULL)
390 { 388 {
391 xfree (button_tbl); 389 xfree (button_tbl);
392 ImageList_Destroy (ilist); 390 ImageList_Destroy (ilist);
393 error ("couldn't create toolbar"); 391 gui_error ("couldn't create toolbar", Qunbound);
394 } 392 }
395 393
396 /* finally populate with images */ 394 /* finally populate with images */
397 if (SendMessage (toolbarwnd, TB_BUTTONSTRUCTSIZE, 395 if (SendMessage (toolbarwnd, TB_BUTTONSTRUCTSIZE,
398 (WPARAM)sizeof(TBBUTTON), (LPARAM)0) == -1) 396 (WPARAM)sizeof(TBBUTTON), (LPARAM)0) == -1)
399 { 397 {
400 mswindows_clear_toolbar (f, pos, 0); 398 mswindows_clear_toolbar (f, pos, 0);
401 error ("couldn't set button structure size"); 399 gui_error ("couldn't set button structure size", Qunbound);
402 } 400 }
403 401
404 if (vert) 402 if (vert)
405 height = min (bmheight + padding, height); 403 height = min (bmheight + padding, height);
406 else 404 else
424 /* finally populate with images */ 422 /* finally populate with images */
425 if (!SendMessage (toolbarwnd, TB_ADDBUTTONS, 423 if (!SendMessage (toolbarwnd, TB_ADDBUTTONS,
426 (WPARAM)nbuttons, (LPARAM)button_tbl)) 424 (WPARAM)nbuttons, (LPARAM)button_tbl))
427 { 425 {
428 mswindows_clear_toolbar (f, pos, 0); 426 mswindows_clear_toolbar (f, pos, 0);
429 error ("couldn't add button list to toolbar"); 427 gui_error ("couldn't add button list to toolbar", Qunbound);
430 } 428 }
431 429
432 /* vertical toolbars need more rows */ 430 /* vertical toolbars need more rows */
433 if (vert) 431 if (vert)
434 { 432 {
450 || 448 ||
451 SendMessage (toolbarwnd, TB_SETDISABLEDIMAGELIST, 0, 449 SendMessage (toolbarwnd, TB_SETDISABLEDIMAGELIST, 0,
452 (LPARAM)ilist) < 0) 450 (LPARAM)ilist) < 0)
453 { 451 {
454 mswindows_clear_toolbar (f, pos, 0); 452 mswindows_clear_toolbar (f, pos, 0);
455 error ("couldn't add image list to toolbar"); 453 gui_error ("couldn't add image list to toolbar", Qunbound);
456 } 454 }
457 455
458 /* now display the window */ 456 /* now display the window */
459 ShowWindow (toolbarwnd, SW_SHOW); 457 ShowWindow (toolbarwnd, SW_SHOW);
460 /* no idea why this is necessary but initial display will not 458 /* no idea why this is necessary but initial display will not