Tk Source Code

Check-in [4c7b16f9]
Login

Many hyperlinks are disabled.
Use anonymous login to enable hyperlinks.

Overview
Comment:Bug 3500545: tk_getOpenFile -multiple 1 wrong on windows
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA1: 4c7b16f90b1096e7c5068a4901fcaaf9696f4a2b
User & Date: jan.nijtmans 2012-11-14 13:46:14
Context
2012-11-15
11:55
Simplification: don't declare struct types that are never used. check-in: 91aa0783 user: jan.nijtmans tags: trunk
2012-11-14
16:55
merge trunk check-in: 9144cea2 user: dgp tags: core-8-6-0-rc
13:46
Bug 3500545: tk_getOpenFile -multiple 1 wrong on windows check-in: 4c7b16f9 user: jan.nijtmans tags: trunk
2012-11-13
10:22
missing changelog entry check-in: f1672bf3 user: jan.nijtmans tags: trunk
Changes
Hide Diffs Unified Diffs Ignore Whitespace Patch

Changes to ChangeLog.






1
2
3
4
5
6
7





2012-11-11  Jan Nijtmans  <[email protected]>

	* win/tkWinTest.c: [Bug 3585396]: winDialog.test requires user
	* tests/winDialog.test: interaction.

2012-11-07  Donal K. Fellows  <[email protected]>

>
>
>
>
>







1
2
3
4
5
6
7
8
9
10
11
12
2012-11-14  Jan Nijtmans  <[email protected]>

	* win/tkWinDialog.c: [Bug 3500545]: tk_getOpenFile -multiple 1 wrong
	on windows

2012-11-11  Jan Nijtmans  <[email protected]>

	* win/tkWinTest.c: [Bug 3585396]: winDialog.test requires user
	* tests/winDialog.test: interaction.

2012-11-07  Donal K. Fellows  <[email protected]>

Changes to win/tkWinDialog.c.

1030
1031
1032
1033
1034
1035
1036
1037
1038
1039
1040

1041
1042





1043


1044



1045
1046
1047
1048
1049
1050
1051
				*buffer = '\0';
			    }
			    *tmp++ = *buffer++;
			}
		    }
		    *tmp = '\0';		/* Second NULL terminator. */
		} else {
		    buffer[selsize] = '\0';	/* Second NULL terminator. */

		    /*
		     * Replace directory terminating NULL with a backslash.

		     */






		    buffer--;


		    *buffer = '\\';



		}
	    } else {
		/*
		 * Nothing is selected, so just empty the string.
		 */

		if (buffer != NULL) {







<

|
|
>


>
>
>
>
>
|
>
>
|
>
>
>







1030
1031
1032
1033
1034
1035
1036

1037
1038
1039
1040
1041
1042
1043
1044
1045
1046
1047
1048
1049
1050
1051
1052
1053
1054
1055
1056
1057
1058
1059
1060
1061
				*buffer = '\0';
			    }
			    *tmp++ = *buffer++;
			}
		    }
		    *tmp = '\0';		/* Second NULL terminator. */
		} else {


			/*
		     * Replace directory terminating NULL with a with a backslash,
		     * but only if not an absolute path.
		     */

		    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 {
		/*
		 * Nothing is selected, so just empty the string.
		 */

		if (buffer != NULL) {