Mercurial > hg > xemacs-beta

comparison src/glyphs-gtk.c @ 2500:3d8143fc88e1

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
[xemacs-hg @ 2005-01-24 23:33:30 by ben] get working with VC7 config.inc.samp: Declare OPTIONAL_LIBRARY_DIR as root of library directories. Redo all graphics library defaults to mirror the versions and directories in the current binary aux distribution on xemacs web site. Enable TIFF and COMPFACE by default since you can now compile with them and binary libs are provided. xemacs.mak: Put our own directories first in case of conflict (e.g. config.h in compface). xemacs.mak: Use MSVCRT to avoid link problems. s/windowsnt.h: bytecode.c, print.c: Add casts to avoid warning. compiler.h: Add MSC_VERSION and include definitions of DOESNT_RETURN and friends here, like for GCC. Need different definitions for VC7 and VC6. s/windowsnt.h: Remove stuff moved to compiler.h. Disable warning 4646 ("function declared with __declspec(noreturn) has non-void return type") on VC7 since lots of Lisp primitives trigger this and there is no easy way to kludge around the warning. glyphs-eimage.c: Some really nasty hacks to allow TIFF and JPEG to both be compiled. #### The better solution is to move the TIFF and JPEG code to different files. glyphs-msw.c: Define __STDC__ to avoid problems with compface.h. intl-auto-encap-win32.c, intl-auto-encap-win32.h, intl-encap-win32.c, syswindows.h: Those wankers at Microsoft cannot leave well enough alone. Various functions change parameter types semi-randomly between VC6 and VC7, so we need to include our own versions that can handle both kinds with appropriate casting. EmacsFrame.c, EmacsShell-sub.c, EmacsShell.c, alloc.c, alloca.c, buffer.c, bytecode.c, charset.h, chartab.c, cm.c, console-stream.c, console.c, data.c, debug.h, device-msw.c, device-tty.c, device-x.c, doprnt.c, dumper.c, dynarr.c, elhash.c, emacs.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, fns.c, font-lock.c, frame-gtk.c, frame-x.c, frame.c, free-hook.c, gccache-gtk.c, glyphs-eimage.c, glyphs-gtk.c, glyphs-msw.c, glyphs-x.c, glyphs.c, gtk-glue.c, gutter.c, input-method-xlib.c, insdel.c, intl-win32.c, keymap.c, lisp.h, lread.c, lstream.c, macros.c, malloc.c, menubar-gtk.c, menubar-msw.c, menubar-x.c, mule-coding.c, native-gtk-toolbar.c, number.c, objects-msw.c, objects.c, print.c, process-nt.c, process-unix.c, process.c, ralloc.c, rangetab.c, redisplay-gtk.c, redisplay-msw.c, redisplay-output.c, redisplay-tty.c, redisplay-x.c, redisplay.c, regex.c, scrollbar-gtk.c, scrollbar-x.c, search.c, select-x.c, signal.c, specifier.c, specifier.h, strftime.c, sunplay.c, symbols.c, sysdep.c, sysproc.h, text.c, text.h, toolbar-common.c, toolbar-msw.c, toolbar.c, ui-gtk.c, unexnt.c, unicode.c, win32.c, window.c, xgccache.c, s/windowsnt.h: abort() -> ABORT(). Eliminate preprocessor games with abort() since it creates huge problems in VC7, solvable only by including massive amounts of files in every compile (and not worth it).
author ben
date Mon, 24 Jan 2005 23:34:34 +0000
parents ab71ad6ff3dd
children de9952d2ed18
comparison
equal deleted inserted replaced
2499:4c5ee4d2e921 2500:3d8143fc88e1
399 } 399 }
400 } 400 }
401 #endif 401 #endif
402 else if (IMAGE_INSTANCE_TYPE (p) == IMAGE_SUBWINDOW) 402 else if (IMAGE_INSTANCE_TYPE (p) == IMAGE_SUBWINDOW)
403 { 403 {
404 abort(); 404 ABORT();
405 } 405 }
406 else 406 else
407 { 407 {
408 int i; 408 int i;
409 if (IMAGE_INSTANCE_PIXMAP_TIMEOUT (p)) 409 if (IMAGE_INSTANCE_PIXMAP_TIMEOUT (p))
761 { 761 {
762 GdkWindow *d; 762 GdkWindow *d;
763 gint width, height, depth; 763 gint width, height, depth;
764 764
765 if (!DEVICE_GTK_P (device)) 765 if (!DEVICE_GTK_P (device))
766 abort (); 766 ABORT ();
767 767
768 IMAGE_INSTANCE_DEVICE (ii) = device; 768 IMAGE_INSTANCE_DEVICE (ii) = device;
769 IMAGE_INSTANCE_TYPE (ii) = IMAGE_COLOR_PIXMAP; 769 IMAGE_INSTANCE_TYPE (ii) = IMAGE_COLOR_PIXMAP;
770 770
771 d = GET_GTK_WIDGET_WINDOW (DEVICE_GTK_APP_SHELL (device)); 771 d = GET_GTK_WIDGET_WINDOW (DEVICE_GTK_APP_SHELL (device));
1008 XINT (IMAGE_INSTANCE_PIXMAP_HOTSPOT_Y (ii)) : 0); 1008 XINT (IMAGE_INSTANCE_PIXMAP_HOTSPOT_Y (ii)) : 0);
1009 } 1009 }
1010 break; 1010 break;
1011 1011
1012 default: 1012 default:
1013 abort (); 1013 ABORT ();
1014 } 1014 }
1015 } 1015 }
1016 1016
1017 static void 1017 static void
1018 xbm_instantiate_1 (Lisp_Object image_instance, Lisp_Object instantiator, 1018 xbm_instantiate_1 (Lisp_Object image_instance, Lisp_Object instantiator,
1302 } 1302 }
1303 1303
1304 break; 1304 break;
1305 1305
1306 default: 1306 default:
1307 abort (); 1307 ABORT ();
1308 } 1308 }
1309 1309
1310 UNGCPRO; 1310 UNGCPRO;
1311 } 1311 }
1312 #endif /* HAVE_XPM */ 1312 #endif /* HAVE_XPM */
1927 gtk_unmap_subwindow (Lisp_Image_Instance *p) 1927 gtk_unmap_subwindow (Lisp_Image_Instance *p)
1928 { 1928 {
1929 if (IMAGE_INSTANCE_TYPE (p) == IMAGE_SUBWINDOW) 1929 if (IMAGE_INSTANCE_TYPE (p) == IMAGE_SUBWINDOW)
1930 { 1930 {
1931 /* We don't support subwindows, but we do support widgets... */ 1931 /* We don't support subwindows, but we do support widgets... */
1932 abort (); 1932 ABORT ();
1933 } 1933 }
1934 else /* must be a widget */ 1934 else /* must be a widget */
1935 { 1935 {
1936 /* Since we are being unmapped we want the enclosing frame to 1936 /* Since we are being unmapped we want the enclosing frame to
1937 get focus. The losing with simple scrolling but is the safest 1937 get focus. The losing with simple scrolling but is the safest
1950 assert (dga->width > 0 && dga->height > 0); 1950 assert (dga->width > 0 && dga->height > 0);
1951 1951
1952 if (IMAGE_INSTANCE_TYPE (p) == IMAGE_SUBWINDOW) 1952 if (IMAGE_INSTANCE_TYPE (p) == IMAGE_SUBWINDOW)
1953 { 1953 {
1954 /* No subwindow support... */ 1954 /* No subwindow support... */
1955 abort (); 1955 ABORT ();
1956 } 1956 }
1957 else /* must be a widget */ 1957 else /* must be a widget */
1958 { 1958 {
1959 struct frame *f = XFRAME (IMAGE_INSTANCE_FRAME (p)); 1959 struct frame *f = XFRAME (IMAGE_INSTANCE_FRAME (p));
1960 GtkWidget *wid = IMAGE_INSTANCE_GTK_CLIPWIDGET (p); 1960 GtkWidget *wid = IMAGE_INSTANCE_GTK_CLIPWIDGET (p);
2389 { 2389 {
2390 } 2390 }
2391 else 2391 else
2392 { 2392 {
2393 /* Unknown button type... */ 2393 /* Unknown button type... */
2394 abort(); 2394 ABORT();
2395 } 2395 }
2396 } 2396 }
2397 2397
2398 /* get properties of a button */ 2398 /* get properties of a button */
2399 static Lisp_Object 2399 static Lisp_Object