diff options
| author | dgp <dgp@users.sourceforge.net> | 2013-03-22 15:11:22 (GMT) |
|---|---|---|
| committer | dgp <dgp@users.sourceforge.net> | 2013-03-22 15:11:22 (GMT) |
| commit | 799b9f787adc4145bcf9d3834de9656e0b93f04c (patch) | |
| tree | 398503485909642466d8b09fb3aca93606f46b57 /generic/tkMain.c | |
| parent | c8f45542bbffa9d476314be5fdafc6dc87216641 (diff) | |
| parent | 1e43f52d3f5a853bf95be27798ace31ea8ee2884 (diff) | |
| download | tk-799b9f787adc4145bcf9d3834de9656e0b93f04c.zip tk-799b9f787adc4145bcf9d3834de9656e0b93f04c.tar.gz tk-799b9f787adc4145bcf9d3834de9656e0b93f04c.tar.bz2 | |
merge trunk
Diffstat (limited to 'generic/tkMain.c')
| -rw-r--r-- | generic/tkMain.c | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/generic/tkMain.c b/generic/tkMain.c index 3be7189..5d58932 100644 --- a/generic/tkMain.c +++ b/generic/tkMain.c @@ -132,12 +132,15 @@ Tk_MainEx( Tcl_DString appName; /* - * Ensure that we are getting the matching version of Tcl. This is really - * only an issue when Tk is loaded dynamically. + * Ensure that we are getting a compatible version of Tcl. */ - if (Tcl_InitStubs(interp, TCL_VERSION, 0) == NULL) { - abort(); + if (Tcl_InitStubs(interp, "8.5.0", 0) == NULL) { + if (Tcl_InitStubs(interp, "8.1", 0) == NULL) { + abort(); + } else { + Tcl_Panic("%s", Tcl_GetStringResult(interp)); + } } #if defined(__WIN32__) && !defined(__WIN64__) && !defined(STATIC_BUILD) |