summaryrefslogtreecommitdiffstats
path: root/generic/tkTest.c
diff options
context:
space:
mode:
authorjan.nijtmans <nijtmans@users.sourceforge.net>2013-06-13 10:37:24 (GMT)
committerjan.nijtmans <nijtmans@users.sourceforge.net>2013-06-13 10:37:24 (GMT)
commita9417a5cc8802ec3945cbc12e39ed01724be0067 (patch)
tree83a004e66e134b8ec0416e8d69277ae94c969bb8 /generic/tkTest.c
parent347946d329fcc454775484c08e7764054811c92a (diff)
parentccfa40c8ce8aca2cfd03317fab6b31cdc3910895 (diff)
downloadtk-a9417a5cc8802ec3945cbc12e39ed01724be0067.zip
tk-a9417a5cc8802ec3945cbc12e39ed01724be0067.tar.gz
tk-a9417a5cc8802ec3945cbc12e39ed01724be0067.tar.bz2
Some more fixes for Cygwin32/64 in win32 GUI mode.
Now that this is fully working, eliminate all usage of WISH_BUILD_LIB_SPEC: TK_BUILD_LIB_SPEC can be used everywhere in stead. Remove some old carbon-leftovers from configure/make (see [3607215]).
Diffstat (limited to 'generic/tkTest.c')
-rw-r--r--generic/tkTest.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/generic/tkTest.c b/generic/tkTest.c
index 0fd7d9b..03431c9 100644
--- a/generic/tkTest.c
+++ b/generic/tkTest.c
@@ -160,7 +160,7 @@ static int TestfontObjCmd(ClientData dummy,
Tcl_Obj *const objv[]);
static int TestmakeexistCmd(ClientData dummy,
Tcl_Interp *interp, int argc, const char **argv);
-#if !(defined(__WIN32__) || defined(MAC_OSX_TK))
+#if !(defined(__WIN32__) || defined(MAC_OSX_TK) || defined(__CYGWIN__))
static int TestmenubarCmd(ClientData dummy,
Tcl_Interp *interp, int argc, const char **argv);
#endif
@@ -186,7 +186,7 @@ static void CustomOptionFree(ClientData clientData,
Tk_Window tkwin, char *internalPtr);
static int TestpropCmd(ClientData dummy,
Tcl_Interp *interp, int argc, const char **argv);
-#if !(defined(__WIN32__) || defined(MAC_OSX_TK))
+#if !(defined(__WIN32__) || defined(MAC_OSX_TK) || defined(__CYGWIN__))
static int TestwrapperCmd(ClientData dummy,
Tcl_Interp *interp, int argc, const char **argv);
#endif
@@ -262,7 +262,7 @@ Tktest_Init(
#if defined(__WIN32__) || defined(MAC_OSX_TK)
Tcl_CreateCommand(interp, "testmetrics", TestmetricsCmd,
(ClientData) Tk_MainWindow(interp), NULL);
-#else
+#elif !defined(__CYGWIN__)
Tcl_CreateCommand(interp, "testmenubar", TestmenubarCmd,
(ClientData) Tk_MainWindow(interp), NULL);
Tcl_CreateCommand(interp, "testsend", TkpTestsendCmd,
@@ -1689,7 +1689,7 @@ TestmakeexistCmd(
*/
/* ARGSUSED */
-#if !(defined(__WIN32__) || defined(MAC_OSX_TK))
+#if !(defined(__WIN32__) || defined(MAC_OSX_TK) || defined(__CYGWIN__))
static int
TestmenubarCmd(
ClientData clientData, /* Main window for application. */
@@ -1891,7 +1891,7 @@ TestpropCmd(
return TCL_OK;
}
-#if !(defined(__WIN32__) || defined(MAC_OSX_TK))
+#if !(defined(__WIN32__) || defined(MAC_OSX_TK) || defined(__CYGWIN__))
/*
*----------------------------------------------------------------------
*