diff options
author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2014-10-20 09:20:32 (GMT) |
---|---|---|
committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2014-10-20 09:20:32 (GMT) |
commit | 3a75326e43c5f04164e7b9747d8e8e1b081cbe01 (patch) | |
tree | dfa182d5d6cfbb9dd4cc28c47818ab2fedf239a9 | |
parent | 9fd716587273d2aabf8b67fb6d6110c0cd2e486a (diff) | |
download | tk-3a75326e43c5f04164e7b9747d8e8e1b081cbe01.zip tk-3a75326e43c5f04164e7b9747d8e8e1b081cbe01.tar.gz tk-3a75326e43c5f04164e7b9747d8e8e1b081cbe01.tar.bz2 |
- Fix winDialog-9.7 test in case "initialdir" contains capital characters.
- Add "uuid.lib" as requirement for tkWinDialog.c
-rw-r--r-- | tests/winDialog.test | 6 | ||||
-rw-r--r-- | win/tkWinDialog.c | 5 |
2 files changed, 3 insertions, 8 deletions
diff --git a/tests/winDialog.test b/tests/winDialog.test index bbacf3f..ad648c0 100644 --- a/tests/winDialog.test +++ b/tests/winDialog.test @@ -264,10 +264,6 @@ test winDialog-5.6 {GetFileName: valid option, but missing value} -constraints { test winDialog-5.7 {GetFileName: extension begins with .} -constraints { nt testwinevent } -body { -# if (string[0] == '.') { -# string++; -# } - start {set x [tk_getSaveFile -defaultextension .foo -title Save]} set msg {} then { @@ -580,7 +576,7 @@ test winDialog-9.7 {Tk_ChooseDirectoryObjCmd: -initialdir} -constraints { Click ok } string tolower [set x] -} -result [initialdir] +} -result [string tolower [initialdir]] test winDialog-9.8 {Tk_ChooseDirectoryObjCmd: initial directory: Tcl_TranslateFilename()} -constraints { nt } -body { diff --git a/win/tkWinDialog.c b/win/tkWinDialog.c index ee30806..fd5b809 100644 --- a/win/tkWinDialog.c +++ b/win/tkWinDialog.c @@ -14,9 +14,6 @@ #include "tkFont.h" #include <commdlg.h> /* includes common dialog functionality */ -#ifdef _MSC_VER -# pragma comment (lib, "comdlg32.lib") -#endif #include <dlgs.h> /* includes common dialog template defines */ #include <cderr.h> /* includes the common dialog error codes */ @@ -25,6 +22,8 @@ #ifdef _MSC_VER # pragma comment (lib, "shell32.lib") +# pragma comment (lib, "comdlg32.lib") +# pragma comment (lib, "uuid.lib") #endif /* These needed for compilation with VC++ 5.2 */ |