diff options
| author | dgp <dgp@users.sourceforge.net> | 2012-11-09 13:44:19 (GMT) |
|---|---|---|
| committer | dgp <dgp@users.sourceforge.net> | 2012-11-09 13:44:19 (GMT) |
| commit | c132fa924674b3a88c468d2db1ae145db6cb6dfc (patch) | |
| tree | 47bdb1fb563294ec9764ddf571efcefbf7df706f | |
| parent | 87cdc5e96f563eb3ae28924f18fdc58d7e494ad9 (diff) | |
| parent | efc2b75b01133d6de6acdab0e21cd3b2db6fd66f (diff) | |
| download | tk-c132fa924674b3a88c468d2db1ae145db6cb6dfc.zip tk-c132fa924674b3a88c468d2db1ae145db6cb6dfc.tar.gz tk-c132fa924674b3a88c468d2db1ae145db6cb6dfc.tar.bz2 | |
merge 8.5
| -rw-r--r-- | tests/winDialog.test | 6 | ||||
| -rw-r--r-- | win/makefile.vc | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/tests/winDialog.test b/tests/winDialog.test index d340aee..80eb297 100644 --- a/tests/winDialog.test +++ b/tests/winDialog.test @@ -197,7 +197,7 @@ test winDialog-5.6 {GetFileName: Tcl_GetIndexFromObj() == TCL_OK} {nt testwineve test winDialog-5.7 {GetFileName: valid option, but missing value} {nt} { list [catch {tk_getOpenFile -initialdir bar -title} msg] $msg } {1 {value for "-title" missing}} -test winDialog-5.8 {GetFileName: extension begins with .} {nt testwinevent} { +test winDialog-5.8 {GetFileName: extension begins with .} {nt testwinevent knownBug} { # if (string[0] == '.') { # string++; # } @@ -209,7 +209,7 @@ test winDialog-5.8 {GetFileName: extension begins with .} {nt testwinevent} { } string totitle $x } [string totitle [file join [pwd] bar.foo]] -test winDialog-5.9 {GetFileName: extension doesn't begin with .} {nt testwinevent} { +test winDialog-5.9 {GetFileName: extension doesn't begin with .} {nt testwinevent knownBug} { start {set x [tk_getSaveFile -defaultextension foo -title Save]} then { SetText 0x480 bar @@ -342,7 +342,7 @@ test winDialog-5.23 {GetFileName: call GetSaveFileName} {nt testwinevent english set x } {&Save} if {[info exists ::env(TEMP)]} { -test winDialog-5.24 {GetFileName: convert \ to /} {nt testwinevent} { +test winDialog-5.24 {GetFileName: convert \ to /} {nt testwinevent knownBug} { start {set x [tk_getSaveFile -title Back]} then { SetText 0x480 [file nativename \ diff --git a/win/makefile.vc b/win/makefile.vc index d84270d..68df470 100644 --- a/win/makefile.vc +++ b/win/makefile.vc @@ -213,8 +213,8 @@ TTK_SQUARE_WIDGET = 0 STUBPREFIX = $(PROJECT)stub WISHNAMEPREFIX = wish -BINROOT = . -ROOT = .. +BINROOT = $(MAKEDIR) # originally . +ROOT = $(MAKEDIR)\.. # originally .. TK_LIBRARY = $(ROOT)\library |