summaryrefslogtreecommitdiffstats
path: root/generic/tkInt.h
diff options
context:
space:
mode:
authorjan.nijtmans <nijtmans@users.sourceforge.net>2012-02-10 23:55:24 (GMT)
committerjan.nijtmans <nijtmans@users.sourceforge.net>2012-02-10 23:55:24 (GMT)
commit6b5a220cb461aec28a9ed52450f235ba724a26ce (patch)
tree50bfed10a7859a141c470f598ee83cd31ca8ebfd /generic/tkInt.h
parenta6c53695816b1684ab4de2254aca2f0750585f91 (diff)
downloadtk-6b5a220cb461aec28a9ed52450f235ba724a26ce.zip
tk-6b5a220cb461aec28a9ed52450f235ba724a26ce.tar.gz
tk-6b5a220cb461aec28a9ed52450f235ba724a26ce.tar.bz2
proposed fix for bug-3486474
Diffstat (limited to 'generic/tkInt.h')
-rw-r--r--generic/tkInt.h7
1 files changed, 7 insertions, 0 deletions
diff --git a/generic/tkInt.h b/generic/tkInt.h
index 777201e..c274236 100644
--- a/generic/tkInt.h
+++ b/generic/tkInt.h
@@ -1213,6 +1213,13 @@ EXTERN int TkParsePadAmount _ANSI_ARGS_((Tcl_Interp *interp,
Tk_Window tkwin, Tcl_Obj *objPtr,
int *pad1Ptr, int *pad2Ptr));
EXTERN int TkpAlwaysShowSelection _ANSI_ARGS_((Tk_Window tkwin));
+#ifdef __WIN32__
+#define TkParseColor XParseColor
+#else
+EXTERN Status TkParseColor _ANSI_ARGS_((Display * display,
+ Colormap map, _Xconst char* spec,
+ XColor * colorPtr));
+#endif
/*
* Unsupported commands.