diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2012-05-09 21:30:17 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2012-05-09 21:30:17 (GMT) |
| commit | 1781ae2223312ebc0d57a9861834a2be6904b53b (patch) | |
| tree | 910f808d33b01cb133375f4d3021107f0fc845dc /generic | |
| parent | 302dfe1be6830add9d1bd8b57b4bc6c00fc609b3 (diff) | |
| parent | 7da887fc2b6f0c7e19b48fbb6b464b35d31aad24 (diff) | |
| download | tk-1781ae2223312ebc0d57a9861834a2be6904b53b.zip tk-1781ae2223312ebc0d57a9861834a2be6904b53b.tar.gz tk-1781ae2223312ebc0d57a9861834a2be6904b53b.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.decls | 2 | ||||
| -rw-r--r-- | generic/tkIntPlatDecls.h | 4 | ||||
| -rw-r--r-- | generic/tkWindow.c | 6 |
3 files changed, 6 insertions, 6 deletions
diff --git a/generic/tkInt.decls b/generic/tkInt.decls index 7a69e50..2d67616 100644 --- a/generic/tkInt.decls +++ b/generic/tkInt.decls @@ -706,7 +706,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 f681397..9ad8a4f 100644 --- a/generic/tkIntPlatDecls.h +++ b/generic/tkIntPlatDecls.h @@ -52,7 +52,7 @@ EXTERN void TkpSetCapture(TkWindow *winPtr); /* 8 */ EXTERN void TkpSetCursor(TkpCursor cursor); /* 9 */ -EXTERN void TkpWmSetState(TkWindow *winPtr, int state); +EXTERN int TkpWmSetState(TkWindow *winPtr, int state); /* 10 */ EXTERN void TkSetPixmapColormap(Pixmap pixmap, Colormap colormap); /* 11 */ @@ -275,7 +275,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 4d5e895..278c8bc 100644 --- a/generic/tkWindow.c +++ b/generic/tkWindow.c @@ -859,7 +859,7 @@ TkCreateMainWindow( { Tk_Window tkwin; int dummy, isSafe; -#ifdef __WIN32__ +#if defined(__WIN32__) && !defined(STATIC_BUILD) int isWin32 = 0; #endif Tcl_HashEntry *hPtr; @@ -869,7 +869,7 @@ TkCreateMainWindow( ClientData clientData; ThreadSpecificData *tsdPtr = 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 @@ -961,7 +961,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; } |