diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2012-05-16 13:31:48 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2012-05-16 13:31:48 (GMT) |
| commit | 31f8fd62815ade2416fca697fea79938ab61d230 (patch) | |
| tree | 34f7f531464329534828bc183ab4079b2de3a103 /generic/tkWindow.c | |
| parent | 1781ae2223312ebc0d57a9861834a2be6904b53b (diff) | |
| parent | c29a2d58d9c3de29bcd7e88011aea2b9c1bcd92e (diff) | |
| download | tk-31f8fd62815ade2416fca697fea79938ab61d230.zip tk-31f8fd62815ade2416fca697fea79938ab61d230.tar.gz tk-31f8fd62815ade2416fca697fea79938ab61d230.tar.bz2 | |
implement TkSetPixmapColormap and TkpPrintWindowId for cygwin
cleanup some more unused CYGWIN stuff
Diffstat (limited to 'generic/tkWindow.c')
| -rw-r--r-- | generic/tkWindow.c | 18 |
1 files changed, 5 insertions, 13 deletions
diff --git a/generic/tkWindow.c b/generic/tkWindow.c index 278c8bc..b2c5310 100644 --- a/generic/tkWindow.c +++ b/generic/tkWindow.c @@ -14,7 +14,9 @@ #include "tkInt.h" -#if !(defined(__WIN32__) || defined(MAC_OSX_TK)) +#ifdef __WIN32__ +#include "tkWinInt.h" +#elif !(defined(__WIN32__) || defined(__CYGWIN__) || defined(MAC_OSX_TK)) #include "tkUnixInt.h" #endif @@ -859,9 +861,6 @@ TkCreateMainWindow( { Tk_Window tkwin; int dummy, isSafe; -#if defined(__WIN32__) && !defined(STATIC_BUILD) - int isWin32 = 0; -#endif Tcl_HashEntry *hPtr; register TkMainInfo *mainPtr; register TkWindow *winPtr; @@ -869,14 +868,6 @@ TkCreateMainWindow( ClientData clientData; ThreadSpecificData *tsdPtr = Tcl_GetThreadData(&dataKey, sizeof(ThreadSpecificData)); -#if defined(__WIN32__) && !defined(STATIC_BUILD) - Tcl_Obj *stringObjPtr = Tcl_GetVar2Ex(interp, "::tcl_platform", "platform", 0); - - if (stringObjPtr - && !strcmp(Tcl_GetString(stringObjPtr), "windows")) { - isWin32 = 1; - } -#endif /* * Panic if someone updated the TkWindow structure without also updating @@ -962,7 +953,8 @@ TkCreateMainWindow( Tcl_Panic("TkCreateMainWindow: builtin command with NULL string and object procs"); } #if defined(__WIN32__) && !defined(STATIC_BUILD) - if (!isWin32 && (cmdPtr->flags & WINMACONLY)) { + if ((cmdPtr->flags & WINMACONLY) && tclStubsPtr->reserved9) { + /* We are running on Cygwin, so don't use the win32 dialogs */ continue; } #endif |