diff options
| author | Daniel Wilhelm <daniel@wili.li> | 2014-04-18 17:24:59 +0200 |
|---|---|---|
| committer | Daniel Wilhelm <daniel@wili.li> | 2014-04-18 17:24:59 +0200 |
| commit | a1c91f4695e208d5a8f80dc37b1818169b7829ff (patch) | |
| tree | 52f5134376d17c99b6c9e53133a2eb5cf171377c /ui/folder_history_box.cpp | |
| parent | 5.16 (diff) | |
| download | FreeFileSync-a1c91f4695e208d5a8f80dc37b1818169b7829ff.tar.gz FreeFileSync-a1c91f4695e208d5a8f80dc37b1818169b7829ff.tar.bz2 FreeFileSync-a1c91f4695e208d5a8f80dc37b1818169b7829ff.zip | |
5.17
Diffstat (limited to 'ui/folder_history_box.cpp')
| -rw-r--r-- | ui/folder_history_box.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/ui/folder_history_box.cpp b/ui/folder_history_box.cpp index c5400272..89832a98 100644 --- a/ui/folder_history_box.cpp +++ b/ui/folder_history_box.cpp @@ -35,11 +35,11 @@ FolderHistoryBox::FolderHistoryBox(wxWindow* parent, warn_static("mac") warn_static("linux") -#if defined FFS_WIN +#if defined ZEN_WIN //on Win, this mouse click event only fires, when clicking on the small down arrow, NOT when clicking on the text field //thanks to wxWidgets' non-portability it's exactly the converse on Linux! Connect(wxEVT_LEFT_DOWN, wxEventHandler(FolderHistoryBox::OnRequireHistoryUpdate), nullptr, this); -#elif defined FFS_LINUX || defined FFS_MAC +#elif defined ZEN_LINUX || defined ZEN_MAC /* we can't attach to wxEVT_COMMAND_TEXT_UPDATED, since setValueAndUpdateList() will implicitly emit wxEVT_COMMAND_TEXT_UPDATED again when calling Clear()! => Crash on Suse/X11/wxWidgets 2.9.4 on startup (setting a flag to guard against recursion does not work, still crash) @@ -63,7 +63,7 @@ void FolderHistoryBox::setValueAndUpdateList(const wxString& dirname) std::vector<wxString> dirList; { //add some aliases to allow user changing to volume name and back, if possible - std::vector<Zstring> aliases = getDirectoryAliases(toZ(dirname)); + std::vector<Zstring> aliases = getDirectoryAliases(toZ(dirname)); //may block when resolving [<volume name>] std::transform(aliases.begin(), aliases.end(), std::back_inserter(dirList), [](const Zstring& str) { return utfCvrtTo<wxString>(str); }); } if (sharedHistory_.get()) |