diff options
| -rw-r--r-- | generic/tkConsole.c | 2 | ||||
| -rw-r--r-- | generic/tkMain.c | 2 | ||||
| -rw-r--r-- | generic/tkWindow.c | 10 | ||||
| -rw-r--r-- | tests/font.test | 3 |
4 files changed, 5 insertions, 12 deletions
diff --git a/generic/tkConsole.c b/generic/tkConsole.c index 621d125..bf86f8f 100644 --- a/generic/tkConsole.c +++ b/generic/tkConsole.c @@ -224,7 +224,7 @@ Tk_InitConsoleChannels( * only an issue when Tk is loaded dynamically. */ - if (Tcl_InitStubs(interp, "8.5", 0) == NULL) { + if (Tcl_InitStubs(interp, "8.5.0", 0) == NULL) { return; } diff --git a/generic/tkMain.c b/generic/tkMain.c index 74b8557..4d348ef 100644 --- a/generic/tkMain.c +++ b/generic/tkMain.c @@ -136,7 +136,7 @@ Tk_MainEx( * only an issue when Tk is loaded dynamically. */ - if (Tcl_InitStubs(interp, "8.5", 0) == NULL) { + if (Tcl_InitStubs(interp, "8.5.0", 0) == NULL) { abort(); } diff --git a/generic/tkWindow.c b/generic/tkWindow.c index 417d16b..057be04 100644 --- a/generic/tkWindow.c +++ b/generic/tkWindow.c @@ -3021,11 +3021,10 @@ Initialize( ThreadSpecificData *tsdPtr; /* - * 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 the matching version of Tcl. */ - if (Tcl_InitStubs(interp, "8.5", 0) == NULL) { + if (Tcl_InitStubs(interp, "8.5.0", 0) == NULL) { return TCL_ERROR; } @@ -3257,11 +3256,6 @@ Initialize( geometry = NULL; } - if (Tcl_PkgRequire(interp, "Tcl", "8.5", 0) == NULL) { - code = TCL_ERROR; - goto done; - } - /* * Provide Tk and its stub table. */ diff --git a/tests/font.test b/tests/font.test index 34e4b83..82af541 100644 --- a/tests/font.test +++ b/tests/font.test @@ -46,10 +46,9 @@ proc csetup {{str ""}} { setup -case [tk windowingsystem] { +switch [tk windowingsystem] { x11 {set fixed "fixed"} win32 {set fixed "courier 12"} - classic - aqua {set fixed "monaco 9"} } |