diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2012-06-08 21:22:17 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2012-06-08 21:22:17 (GMT) |
| commit | 79fa64792bbab42e97785552b9a9cf75fa126695 (patch) | |
| tree | 310a9dbc7cc3e084b145ba3775dfb36cf198c278 /generic/tkMain.c | |
| parent | 2240ad9def4214ab61204d7fb4d7e81868984a25 (diff) | |
| parent | fdeacfff80a809cc26b4720c429274a5ed6331b4 (diff) | |
| download | tk-79fa64792bbab42e97785552b9a9cf75fa126695.zip tk-79fa64792bbab42e97785552b9a9cf75fa126695.tar.gz tk-79fa64792bbab42e97785552b9a9cf75fa126695.tar.bz2 | |
Implement TkCygwinMainEx for loading Cygwin's Tk_MainEx from the Tk dll
Diffstat (limited to 'generic/tkMain.c')
| -rw-r--r-- | generic/tkMain.c | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/generic/tkMain.c b/generic/tkMain.c index c6d5238..99caf27 100644 --- a/generic/tkMain.c +++ b/generic/tkMain.c @@ -139,15 +139,20 @@ Tk_MainEx( abort(); } -#if defined(__WIN32__) && !defined(STATIC_BUILD) +#if defined(__WIN32__) && !defined(__WIN64__) && !defined(STATIC_BUILD) + extern int TkCygwinMainEx(int, char **, Tcl_AppInitProc *, Tcl_Interp *); + if (tclStubsPtr->reserved9) { /* We are running win32 Tk under Cygwin, so let's check * whether the env("DISPLAY") variable or the -display * argument is set. If so, we really want to run the - * Tk_MainEx function of libtk.dll, not this one. */ - if (Tcl_GetVar2(interp, "env", "DISPLAY", TCL_GLOBAL_ONLY)) { + * Tk_MainEx function of libtk8.?.dll, not this one. */ + if (Tcl_GetVar2(interp, "env", "DISPLAY", TCL_GLOBAL_ONLY)) { loadCygwinTk: - Tcl_Panic("Should load libtk.dll now, not yet implemented"); + if (TkCygwinMainEx(argc, argv, appInitProc, interp)) { + /* Should never reach here. */ + return; + } } else { int i; |