Fixed error when browsing for a directory and using a non-ascii starting directory.

git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@10207 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
This commit is contained in:
Manolo Gouy 2014-06-24 15:06:24 +00:00
parent f7f820ed4c
commit 10caca062a

View File

@ -441,7 +441,7 @@ int Fl_Native_File_Chooser::showfile() {
int CALLBACK Fl_Native_File_Chooser::Dir_CB(HWND win, UINT msg, LPARAM param, LPARAM data) {
switch (msg) {
case BFFM_INITIALIZED:
if (data) ::SendMessage(win, BFFM_SETSELECTION, TRUE, data);
if (data) ::SendMessage(win, BFFM_SETSELECTIONW, TRUE, data);
break;
case BFFM_SELCHANGED:
TCHAR path[FNFC_MAX_PATH];
@ -518,10 +518,11 @@ int Fl_Native_File_Chooser::showdir() {
_binf.pszDisplayName = displayname;
// PRESET DIR
char presetname[FNFC_MAX_PATH];
WCHAR presetname[FNFC_MAX_PATH];
if ( _directory ) {
strcpy(presetname, _directory);
// Unix2Win(presetname);
wcsncpy(presetname, utf8towchar(_directory), FNFC_MAX_PATH);
presetname[FNFC_MAX_PATH-1] = 0;
_binf.lParam = (LPARAM)presetname;
}
else _binf.lParam = 0;