diff options
| author | lecoanet | 2004-04-30 14:34:45 +0000 |
|---|---|---|
| committer | lecoanet | 2004-04-30 14:34:45 +0000 |
| commit | 18fec8e1cabf7098c751f8ad1a342396a3a3830d (patch) | |
| tree | a56bd550b7a159f1abb610569e0eb5df21cac622 /generic | |
| parent | 0afea005129c7549311dfb3d3052c888cef5c489 (diff) | |
| download | tkzinc-18fec8e1cabf7098c751f8ad1a342396a3a3830d.zip tkzinc-18fec8e1cabf7098c751f8ad1a342396a3a3830d.tar.gz tkzinc-18fec8e1cabf7098c751f8ad1a342396a3a3830d.tar.bz2 tkzinc-18fec8e1cabf7098c751f8ad1a342396a3a3830d.tar.xz | |
Reworked for Windows clean compile. This is not that
successful yet.
Diffstat (limited to 'generic')
| -rw-r--r-- | generic/Types.h | 41 |
1 files changed, 22 insertions, 19 deletions
diff --git a/generic/Types.h b/generic/Types.h index b0784ea..8489d2c 100644 --- a/generic/Types.h +++ b/generic/Types.h @@ -79,15 +79,6 @@ # endif #endif -#ifdef TCL_STORAGE_CLASS -# undef TCL_STORAGE_CLASS -#endif -#ifdef BUILD_Tkzinc -# define TCL_STORAGE_CLASS DLLEXPORT -#else -# define TCL_STORAGE_CLASS DLLIMPORT -#endif - #ifdef __CPLUSPLUS__ extern "C" { @@ -101,7 +92,6 @@ typedef ZnReal ZnDim; typedef void *ZnPtr; - #define ZnPixel(color) ((color)->pixel) #define ZnMalloc(size) ((void *)ckalloc(size)) #define ZnFree(ptr) (ckfree((char *)(ptr))) @@ -131,38 +121,48 @@ Tk_GetScrollInfo(interp, argc, (Tcl_Obj **) args, fract, count) * Macros for Windows compatibility */ #ifdef _WIN32 +# include <tkWinInt.h> + # ifndef _MSC_VER # undef EXTERN # define EXTERN # endif -# include <tkWinInt.h> -#undef XFillRectangle +# ifdef TCL_STORAGE_CLASS +# undef TCL_STORAGE_CLASS +# endif +# ifdef BUILD_Tkzinc +# define TCL_STORAGE_CLASS DLLEXPORT +# else +# define TCL_STORAGE_CLASS DLLIMPORT +# endif + +# undef XFillRectangle EXTERN void XFillRectangle(Display* display, Drawable d, GC gc, int x, int y, unsigned int width, unsigned int height); -#undef XFillRectangles +# undef XFillRectangles EXTERN void XFillRectangles(Display*display, Drawable d, GC gc, XRectangle *rectangles, int nrectangles); -#undef XFillArc +# undef XFillArc EXTERN void XFillArc(Display* display, Drawable d, GC gc, int x, int y, unsigned int width, unsigned int height, int start, int extent); -#undef XFillPolygon +# undef XFillPolygon EXTERN void XFillPolygon(Display* display, Drawable d, GC gc, XPoint* points, int npoints, int shape, int mode); -#undef XDrawRectangle +# undef XDrawRectangle EXTERN void XDrawRectangle(Display* display, Drawable d, GC gc, int x, int y, unsigned int width, unsigned int height); -#undef XDrawArc +# undef XDrawArc EXTERN void XDrawArc(Display* display, Drawable d, GC gc, int x, int y, unsigned int width, unsigned int height, int start, int extent); -#undef XDrawLine +# undef XDrawLine EXTERN void XDrawLine(Display* display, Drawable d, GC gc, int x1, int y1, int x2, int y2); -#undef XDrawLines +# undef XDrawLines EXTERN void XDrawLines(Display* display, Drawable d, GC gc, XPoint* points, int npoints, int mode); @@ -174,6 +174,7 @@ EXTERN TkRegion ZnPolygonRegion(XPoint *points, int n, int fill_rule); # ifdef GL # define ZnGLContext HGLRC +# define ZnGLWaitX() # define ZnGLWaitGL() # define ZN_GL_LINE_WIDTH_RANGE GL_LINE_WIDTH_RANGE # define ZN_GL_POINT_SIZE_RANGE GL_POINT_SIZE_RANGE @@ -189,6 +190,8 @@ EXTERN TkRegion ZnPolygonRegion(XPoint *points, int n, XOffsetRegion((Region) reg, dx, dy) # ifdef GL # define ZnGLContext GLXContext +# define ZnGLWaitX() \ + glXWaitX() # define ZnGLWaitGL() \ glXWaitGL() # define ZN_GL_LINE_WIDTH_RANGE GL_SMOOTH_LINE_WIDTH_RANGE |