aboutsummaryrefslogtreecommitdiff
path: root/generic
diff options
context:
space:
mode:
authorlecoanet2004-05-10 15:38:58 +0000
committerlecoanet2004-05-10 15:38:58 +0000
commita8fcb0c3ec8e2a14e2ade2555bbc030b6ef89c9a (patch)
treecf9ced21770f3f053380783efb3544c1320fdb65 /generic
parent38bc0336f32babcbb291c9a206f310ba3e1cf222 (diff)
downloadtkzinc-a8fcb0c3ec8e2a14e2ade2555bbc030b6ef89c9a.zip
tkzinc-a8fcb0c3ec8e2a14e2ade2555bbc030b6ef89c9a.tar.gz
tkzinc-a8fcb0c3ec8e2a14e2ade2555bbc030b6ef89c9a.tar.bz2
tkzinc-a8fcb0c3ec8e2a14e2ade2555bbc030b6ef89c9a.tar.xz
Changes to remove Windows warnings.
Diffstat (limited to 'generic')
-rw-r--r--generic/Types.h39
1 files changed, 9 insertions, 30 deletions
diff --git a/generic/Types.h b/generic/Types.h
index 8489d2c..1a9b7bc 100644
--- a/generic/Types.h
+++ b/generic/Types.h
@@ -73,9 +73,9 @@
/* This EXTERN declaration is needed for Tcl < 8.0.3 */
#ifndef EXTERN
# ifdef __cplusplus
-# define EXTERN extern "C"
+# define EXTERN extern "C" TCL_STORAGE_CLASS
# else
-# define EXTERN extern
+# define EXTERN extern TCL_STORAGE_CLASS
# endif
#endif
@@ -137,41 +137,20 @@ Tk_GetScrollInfo(interp, argc, (Tcl_Obj **) args, fract, count)
# endif
# undef XFillRectangle
-EXTERN void XFillRectangle(Display* display, Drawable d, GC gc,
- int x, int y, unsigned int width,
- unsigned int height);
# undef XFillRectangles
-EXTERN void XFillRectangles(Display*display, Drawable d, GC gc,
- XRectangle *rectangles, int nrectangles);
# 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
-EXTERN void XFillPolygon(Display* display, Drawable d, GC gc,
- XPoint* points, int npoints, int shape,
- int mode);
# undef XDrawRectangle
-EXTERN void XDrawRectangle(Display* display, Drawable d, GC gc,
- int x, int y, unsigned int width,
- unsigned int height);
# 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
-EXTERN void XDrawLine(Display* display, Drawable d, GC gc,
- int x1, int y1, int x2, int y2);
# undef XDrawLines
-EXTERN void XDrawLines(Display* display, Drawable d, GC gc,
- XPoint* points, int npoints, int mode);
-
-EXTERN ZnBool ZnPointInRegion(TkRegion reg, int x, int y);
-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);
+
+ZnBool ZnPointInRegion(TkRegion reg, int x, int y);
+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);
# ifdef GL
# define ZnGLContext HGLRC
# define ZnGLWaitX()