diff options
| author | Daniel Wilhelm <daniel@wili.li> | 2014-04-18 17:27:42 +0200 |
|---|---|---|
| committer | Daniel Wilhelm <daniel@wili.li> | 2014-04-18 17:27:42 +0200 |
| commit | b916407a2a06f8452e82b74dc44c54acbcc572b0 (patch) | |
| tree | 46358e0bb035fca0f42edb4b5b8aa5f1613814af /ui/dir_name.cpp | |
| parent | 5.20 (diff) | |
| download | FreeFileSync-b916407a2a06f8452e82b74dc44c54acbcc572b0.tar.gz FreeFileSync-b916407a2a06f8452e82b74dc44c54acbcc572b0.tar.bz2 FreeFileSync-b916407a2a06f8452e82b74dc44c54acbcc572b0.zip | |
5.21
Diffstat (limited to 'ui/dir_name.cpp')
| -rw-r--r-- | ui/dir_name.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/ui/dir_name.cpp b/ui/dir_name.cpp index 356b0888..cbaafe78 100644 --- a/ui/dir_name.cpp +++ b/ui/dir_name.cpp @@ -220,7 +220,7 @@ void DirectoryName<NameControl>::onSelectDir(wxCommandEvent& event) }; //some random GUID => have Windows save IFileDialog state separately from other file/dir pickers! showFolderPicker(static_cast<HWND>(selectButton_.GetHWND()), //in; ==HWND - defaultDirname.empty() ? nullptr : defaultDirname.c_str(), //in, optional! + defaultDirname.empty() ? static_cast<const wchar_t*>(nullptr) : defaultDirname.c_str(), //in, optional! &guid, selectedFolder, //out: call freeString() after use! cancelled, //out @@ -235,7 +235,7 @@ void DirectoryName<NameControl>::onSelectDir(wxCommandEvent& event) newFolder = make_unique<wxString>(selectedFolder); } } -#endif +#endif if (!newFolder.get()) { wxDirDialog dirPicker(&selectButton_, _("Select a folder"), defaultDirname); //put modal wxWidgets dialogs on stack: creating on freestore leads to memleak! |