summaryrefslogtreecommitdiffstats
path: root/win/winMain.c
diff options
context:
space:
mode:
authorjan.nijtmans <nijtmans@users.sourceforge.net>2018-10-12 17:55:56 (GMT)
committerjan.nijtmans <nijtmans@users.sourceforge.net>2018-10-12 17:55:56 (GMT)
commit35173f328a7bdde339fa7c8ab2d417e3793b17ed (patch)
treeb2b257bd6dd59e4d3342d12bb9455dd856c3796e /win/winMain.c
parent44a46775976588dfa3a656866b93e898197916bf (diff)
downloadtk-35173f328a7bdde339fa7c8ab2d417e3793b17ed.zip
tk-35173f328a7bdde339fa7c8ab2d417e3793b17ed.tar.gz
tk-35173f328a7bdde339fa7c8ab2d417e3793b17ed.tar.bz2
Merge tcl.m4 with Tcl version. Add zipfs hooks to tkAppInit.c and winMain.c, when available
Diffstat (limited to 'win/winMain.c')
-rw-r--r--win/winMain.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/win/winMain.c b/win/winMain.c
index 62bcbd8..f1d671f 100644
--- a/win/winMain.c
+++ b/win/winMain.c
@@ -145,6 +145,9 @@ _tWinMain(
#ifdef TK_LOCAL_MAIN_HOOK
TK_LOCAL_MAIN_HOOK(&argc, &argv);
+#elif defined(UNICODE) && ((TCL_MAJOR_VERSION > 8) || (TCL_MINOR_VERSION > 6))
+ /* This doesn't work on Windows without UNICODE, neither does it work with Tcl 8.6 */
+ TclZipfs_AppHook(&argc, &argv);
#endif
Tk_Main(argc, argv, TK_LOCAL_APPINIT);