summaryrefslogtreecommitdiffstats
path: root/generic
diff options
context:
space:
mode:
authorjan.nijtmans <nijtmans@users.sourceforge.net>2012-05-09 21:16:51 (GMT)
committerjan.nijtmans <nijtmans@users.sourceforge.net>2012-05-09 21:16:51 (GMT)
commit7da887fc2b6f0c7e19b48fbb6b464b35d31aad24 (patch)
treed6505398089f107ca8ff642724395774c019ac1e /generic
parent588dfc9419dadcedfef8b975a7d0179924a8996c (diff)
parent4ee227410ecad38323de7b712664466afd06aab0 (diff)
downloadtk-7da887fc2b6f0c7e19b48fbb6b464b35d31aad24.zip
tk-7da887fc2b6f0c7e19b48fbb6b464b35d31aad24.tar.gz
tk-7da887fc2b6f0c7e19b48fbb6b464b35d31aad24.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')
-rw-r--r--generic/tkInt.decls2
-rw-r--r--generic/tkIntPlatDecls.h4
-rw-r--r--generic/tkWindow.c6
3 files changed, 6 insertions, 6 deletions
diff --git a/generic/tkInt.decls b/generic/tkInt.decls
index 63f34f5..fc384a1 100644
--- a/generic/tkInt.decls
+++ b/generic/tkInt.decls
@@ -652,7 +652,7 @@ declare 8 win {
void TkpSetCursor(TkpCursor cursor)
}
declare 9 win {
- void TkpWmSetState(TkWindow *winPtr, int state)
+ int TkpWmSetState(TkWindow *winPtr, int state)
}
declare 10 win {
void TkSetPixmapColormap(Pixmap pixmap, Colormap colormap)
diff --git a/generic/tkIntPlatDecls.h b/generic/tkIntPlatDecls.h
index 8de3a71..cee7450 100644
--- a/generic/tkIntPlatDecls.h
+++ b/generic/tkIntPlatDecls.h
@@ -78,7 +78,7 @@ EXTERN void TkpSetCursor(TkpCursor cursor);
#ifndef TkpWmSetState_TCL_DECLARED
#define TkpWmSetState_TCL_DECLARED
/* 9 */
-EXTERN void TkpWmSetState(TkWindow *winPtr, int state);
+EXTERN int TkpWmSetState(TkWindow *winPtr, int state);
#endif
#ifndef TkSetPixmapColormap_TCL_DECLARED
#define TkSetPixmapColormap_TCL_DECLARED
@@ -568,7 +568,7 @@ typedef struct TkIntPlatStubs {
int (*tkpScanWindowId) (Tcl_Interp *interp, CONST char *string, Window *idPtr); /* 6 */
void (*tkpSetCapture) (TkWindow *winPtr); /* 7 */
void (*tkpSetCursor) (TkpCursor cursor); /* 8 */
- void (*tkpWmSetState) (TkWindow *winPtr, int state); /* 9 */
+ int (*tkpWmSetState) (TkWindow *winPtr, int state); /* 9 */
void (*tkSetPixmapColormap) (Pixmap pixmap, Colormap colormap); /* 10 */
void (*tkWinCancelMouseTimer) (void); /* 11 */
void (*tkWinClipboardRender) (TkDisplay *dispPtr, UINT format); /* 12 */
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;
}