2abc28d1f2
Version 4.2 fixes:
1) Fixed problems with windows that have a compound text title
2) Fixed problems with the cursor font name
3) error.c will now compile under Solaris 2.6
4) Fixed misc. compilation warnings. Some survive in error.c and states.c
5) Fixed warp function when two screens have the same program: warp will
now look first on the screen containing the mouse pointer
6) Fixed hot key functions when num lock/shift lock might be pressed
7) Fixed problem with AutoRootMenu startup
8) Fixed problem with VirtualIconic resource
43 lines
1.1 KiB
Plaintext
43 lines
1.1 KiB
Plaintext
--- pixmap.c.orig Thu Jan 13 22:36:12 1994
|
|
+++ ./pixmap.c Sat Jul 17 00:35:59 1999
|
|
@@ -4,7 +4,7 @@
|
|
*/
|
|
|
|
#ifdef IDENT
|
|
-#ident "%W% olvwm version %G%"
|
|
+#ident "@(#)pixmap.c 1.3 olvwm version 09 Feb 1994"
|
|
#endif
|
|
|
|
/*
|
|
@@ -20,8 +20,20 @@
|
|
#include <X11/XWDFile.h>
|
|
|
|
#ifdef XPM
|
|
-#include <xpm.h>
|
|
-#endif
|
|
+#ifndef NO_PIXEL_FIX
|
|
+/* The problem with xpm.h is that it includes <X11/Intrinsic.h> to get
|
|
+ * the typedef for Pixel. Intrinsic.h, however, also typedefs Boolean
|
|
+ * (to char). This causes the compiler to fail on the Boolean typedef
|
|
+ * in <olgx/olgx.h> (which is, of course, also char). <olgx/olgx.h> is
|
|
+ * included within "win.h".
|
|
+ * This kludge typedefs Pixel and defines _XtIntrinsic_h so that the
|
|
+ * real Intrinsic.h does not get included.
|
|
+ */
|
|
+#define _XtIntrinsic_h
|
|
+typedef unsigned long Pixel; /* Index into colormap */
|
|
+#endif /* NO_PIXEL_FIX */
|
|
+#include <X11/xpm.h>
|
|
+#endif XPM
|
|
|
|
#include "i18n.h"
|
|
#include <olgx/olgx.h>
|
|
@@ -159,6 +171,7 @@
|
|
}
|
|
|
|
FreePixmapColors(dpy, ncolors, colors, colormap)
|
|
+ Display *dpy;
|
|
int ncolors;
|
|
XColor *colors;
|
|
Colormap *colormap;
|