diff options
| author | jan.nijtmans <jan.nijtmans@noemail.net> | 2013-01-15 16:48:13 (GMT) |
|---|---|---|
| committer | jan.nijtmans <jan.nijtmans@noemail.net> | 2013-01-15 16:48:13 (GMT) |
| commit | bcbbd496e01a2fc1b556db9a3391dc4f631d9cc4 (patch) | |
| tree | 7da4ab4af7a9789043e70df26fe6d1cfe2547c15 | |
| parent | f7caeab0a32ce7b577c234e72fbe3b4d6bd4e029 (diff) | |
| download | tk-bcbbd496e01a2fc1b556db9a3391dc4f631d9cc4.zip tk-bcbbd496e01a2fc1b556db9a3391dc4f631d9cc4.tar.gz tk-bcbbd496e01a2fc1b556db9a3391dc4f631d9cc4.tar.bz2 | |
Don't use deprecated "case" any more.
Don't do unnecessary Tcl_PkgRequire(..., "Tcl", ...), the preceding Tcl_InitStubs() call already does that, both for dynamic loaded as wel as the static case.
FossilOrigin-Name: c72168ce320dc037392e618615fb4e7b8fec3828
| -rw-r--r-- | generic/tkWindow.c | 8 | ||||
| -rw-r--r-- | tests/font.test | 9 |
2 files changed, 7 insertions, 10 deletions
diff --git a/generic/tkWindow.c b/generic/tkWindow.c index 2bccbb9..40b2fed 100644 --- a/generic/tkWindow.c +++ b/generic/tkWindow.c @@ -3017,8 +3017,7 @@ Initialize(interp) 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, TCL_VERSION, 1) == NULL) { @@ -3242,11 +3241,6 @@ Initialize(interp) geometry = NULL; } - if (Tcl_PkgRequire(interp, "Tcl", TCL_VERSION, 1) == NULL) { - code = TCL_ERROR; - goto done; - } - /* * Provide Tk and its stub table. */ diff --git a/tests/font.test b/tests/font.test index 94953b1..2479334 100644 --- a/tests/font.test +++ b/tests/font.test @@ -49,10 +49,13 @@ proc csetup {{str ""}} { setup -case $tcl_platform(platform) { - unix {set fixed "fixed"} - windows {set fixed "courier 12"} +switch [tk windowingsystem] { + x11 {set fixed "fixed"} + win32 {set fixed "courier 12"} + aqua {set fixed "monaco 9"} } + + set times [font actual {times 0} -family] test font-1.1 {TkFontPkgInit} { |