summaryrefslogtreecommitdiffstats
path: root/generic/tkWindow.c
diff options
context:
space:
mode:
authornijtmans@users.sourceforge.net <jan.nijtmans>2012-05-09 21:16:51 (GMT)
committernijtmans@users.sourceforge.net <jan.nijtmans>2012-05-09 21:16:51 (GMT)
commit02df3d84939f270931cb90b7761a51e6a61034f8 (patch)
treed6505398089f107ca8ff642724395774c019ac1e /generic/tkWindow.c
parent56d57f0237404326126f9c7487f99e694d5744c9 (diff)
parentd5a8ecc90dc80be383cde27bd9e7b404e33f306f (diff)
downloadtk-02df3d84939f270931cb90b7761a51e6a61034f8.zip
tk-02df3d84939f270931cb90b7761a51e6a61034f8.tar.gz
tk-02df3d84939f270931cb90b7761a51e6a61034f8.tar.bz2
Change TkpWmSetState signature to match UNIX, needed for Cygwin
Don't check for cygwin in win32 static build Some more useful #defines for Cygwin
Diffstat (limited to 'generic/tkWindow.c')
-rw-r--r--generic/tkWindow.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/generic/tkWindow.c b/generic/tkWindow.c
index 7cf42ff..2dadfb7 100644
--- a/generic/tkWindow.c
+++ b/generic/tkWindow.c
@@ -858,7 +858,7 @@ TkCreateMainWindow(
{
Tk_Window tkwin;
int dummy, isSafe;
-#ifdef __WIN32__
+#if defined(__WIN32__) && !defined(STATIC_BUILD)
int isWin32 = 0;
#endif
Tcl_HashEntry *hPtr;
@@ -868,7 +868,7 @@ TkCreateMainWindow(
ClientData clientData;
ThreadSpecificData *tsdPtr = (ThreadSpecificData *)
Tcl_GetThreadData(&dataKey, sizeof(ThreadSpecificData));
-#ifdef __WIN32__
+#if defined(__WIN32__) && !defined(STATIC_BUILD)
Tcl_Obj *stringObjPtr = Tcl_GetVar2Ex(interp, "::tcl_platform", "platform", 0);
if (stringObjPtr
@@ -959,7 +959,7 @@ TkCreateMainWindow(
if (cmdPtr->objProc == NULL) {
Tcl_Panic("TkCreateMainWindow: builtin command with NULL string and object procs");
}
-#ifdef __WIN32__
+#if defined(__WIN32__) && !defined(STATIC_BUILD)
if (!isWin32 && (cmdPtr->flags & WINMACONLY)) {
continue;
}