summaryrefslogtreecommitdiffstats
path: root/win
diff options
context:
space:
mode:
authorjan.nijtmans <nijtmans@users.sourceforge.net>2012-11-14 13:46:14 (GMT)
committerjan.nijtmans <nijtmans@users.sourceforge.net>2012-11-14 13:46:14 (GMT)
commited064e742e36ba2e1783c612611bc825ce79b094 (patch)
treee07c8dd167bd8557ed4d325d50996bdd52da0cff /win
parentefee4d5fc9d93a3da7decfba9d738b894bbeaf7b (diff)
downloadtk-ed064e742e36ba2e1783c612611bc825ce79b094.zip
tk-ed064e742e36ba2e1783c612611bc825ce79b094.tar.gz
tk-ed064e742e36ba2e1783c612611bc825ce79b094.tar.bz2
Bug 3500545: tk_getOpenFile -multiple 1 wrong on windows
Diffstat (limited to 'win')
-rw-r--r--win/tkWinDialog.c20
1 files changed, 15 insertions, 5 deletions
diff --git a/win/tkWinDialog.c b/win/tkWinDialog.c
index 9263830..3663807 100644
--- a/win/tkWinDialog.c
+++ b/win/tkWinDialog.c
@@ -1034,14 +1034,24 @@ OFNHookProc(
}
*tmp = '\0'; /* Second NULL terminator. */
} else {
- buffer[selsize] = '\0'; /* Second NULL terminator. */
- /*
- * Replace directory terminating NULL with a backslash.
+ /*
+ * Replace directory terminating NULL with a with a backslash,
+ * but only if not an absolute path.
*/
- buffer--;
- *buffer = '\\';
+ Tcl_DString tmpfile;
+ ConvertExternalFilename(buffer, &tmpfile);
+ if (TCL_PATH_ABSOLUTE ==
+ Tcl_GetPathType(Tcl_DStringValue(&tmpfile))) {
+ /* re-get the full path to the start of the buffer */
+ buffer = (TCHAR *) ofnData->dynFileBuffer;
+ SendMessage(hdlg, CDM_GETSPEC, selsize, (LPARAM) buffer);
+ } else {
+ *(buffer-1) = '\\';
+ }
+ buffer[selsize] = '\0'; /* Second NULL terminator. */
+ Tcl_DStringFree(&tmpfile);
}
} else {
/*