diff options
| author | lecoanet | 2003-04-24 14:08:57 +0000 |
|---|---|---|
| committer | lecoanet | 2003-04-24 14:08:57 +0000 |
| commit | bc07da535fbd483c077986ab96c4dffd7b35ab37 (patch) | |
| tree | b0335148da15178c9781ffb3950425d995e3db63 /generic/Types.h | |
| parent | b6dfef155807e63d0c855dc2825252c647c302ae (diff) | |
| download | tkzinc-bc07da535fbd483c077986ab96c4dffd7b35ab37.zip tkzinc-bc07da535fbd483c077986ab96c4dffd7b35ab37.tar.gz tkzinc-bc07da535fbd483c077986ab96c4dffd7b35ab37.tar.bz2 tkzinc-bc07da535fbd483c077986ab96c4dffd7b35ab37.tar.xz | |
Adjustments for a clean compile with Visual C++.
Diffstat (limited to 'generic/Types.h')
| -rw-r--r-- | generic/Types.h | 60 |
1 files changed, 34 insertions, 26 deletions
diff --git a/generic/Types.h b/generic/Types.h index b84350c..5468fb7 100644 --- a/generic/Types.h +++ b/generic/Types.h @@ -30,12 +30,11 @@ #ifndef _Types_h #define _Types_h -#include "private.h" #ifdef _WIN32 # define WIN32_LEAN_AND_MEAN # include <windows.h> -# undef WIN32_LEAN_AND_MEAN +# undef WIN32_LEAN_AND_MEAN # if defined(_MSC_VER) # define DllEntryPoint DllMain # endif @@ -49,6 +48,8 @@ # endif #endif +#include "private.h" + #define NEED_REAL_STDIO #include <tk.h> @@ -126,39 +127,46 @@ typedef void *ZnPtr; * Macros for Windows compatibility */ #ifdef _WIN32 +# ifndef _MSC_VER +# undef EXTERN +# define EXTERN +# endif # include <tkWinInt.h> #undef XFillRectangle - void XFillRectangle(Display* display, Drawable d, GC gc, - int x, int y, unsigned int width, unsigned int height); +EXTERN void XFillRectangle(Display* display, Drawable d, GC gc, + int x, int y, unsigned int width, + unsigned int height); #undef XFillRectangles -void XFillRectangles(Display*display, Drawable d, GC gc, - XRectangle *rectangles, int nrectangles); +EXTERN void XFillRectangles(Display*display, Drawable d, GC gc, + XRectangle *rectangles, int nrectangles); #undef XFillArc -void XFillArc(Display* display, Drawable d, GC gc, - int x, int y, unsigned int width, unsigned int height, - int start, int extent); +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 -void XFillPolygon(Display* display, Drawable d, GC gc, - XPoint* points, int npoints, int shape, int mode); +EXTERN void XFillPolygon(Display* display, Drawable d, GC gc, + XPoint* points, int npoints, int shape, + int mode); #undef XDrawRectangle -void XDrawRectangle(Display* display, Drawable d, GC gc, - int x, int y, unsigned int width, unsigned int height); +EXTERN void XDrawRectangle(Display* display, Drawable d, GC gc, + int x, int y, unsigned int width, + unsigned int height); #undef XDrawArc -void XDrawArc(Display* display, Drawable d, GC gc, - int x, int y, unsigned int width, unsigned int height, - int start, int extent); +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 - void XDrawLine(Display* display, Drawable d, GC gc, - int x1, int y1, int x2, int y2); +EXTERN void XDrawLine(Display* display, Drawable d, GC gc, + int x1, int y1, int x2, int y2); #undef XDrawLines -void XDrawLines(Display* display, Drawable d, GC gc, - XPoint* points, int npoints, int mode); - -void ZnUnionRegion(TkRegion sra, TkRegion srb, - TkRegion dr_return); -void ZnOffsetRegion(TkRegion reg, int dx, int dy); -TkRegion ZnPolygonRegion(XPoint *points, int n, - int fill_rule); +EXTERN void XDrawLines(Display* display, Drawable d, GC gc, + XPoint* points, int npoints, int mode); + +EXTERN void ZnUnionRegion(TkRegion sra, TkRegion srb, + TkRegion dr_return); +EXTERN void ZnOffsetRegion(TkRegion reg, int dx, int dy); +EXTERN TkRegion ZnPolygonRegion(XPoint *points, int n, + int fill_rule); # ifdef GL # define ZnGLContext HGLRC # define ZnGLMakeCurrent(wi) \ |