diff options
author | Daniel Wilhelm <daniel@wili.li> | 2014-04-18 17:21:16 +0200 |
---|---|---|
committer | Daniel Wilhelm <daniel@wili.li> | 2014-04-18 17:21:16 +0200 |
commit | 6d15812d7d93370d47e63f6bf9f70be40f5a9c5d (patch) | |
tree | 8e7bde205084ca23e1766d42305824c927c2ee5f /ui/folder_history_box.h | |
parent | 5.6 (diff) | |
download | FreeFileSync-6d15812d7d93370d47e63f6bf9f70be40f5a9c5d.tar.gz FreeFileSync-6d15812d7d93370d47e63f6bf9f70be40f5a9c5d.tar.bz2 FreeFileSync-6d15812d7d93370d47e63f6bf9f70be40f5a9c5d.zip |
5.7
Diffstat (limited to 'ui/folder_history_box.h')
-rw-r--r-- | ui/folder_history_box.h | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/ui/folder_history_box.h b/ui/folder_history_box.h index 68197786..49dec582 100644 --- a/ui/folder_history_box.h +++ b/ui/folder_history_box.h @@ -1,7 +1,7 @@ // ************************************************************************** // * This file is part of the FreeFileSync project. It is distributed under * // * GNU General Public License: http://www.gnu.org/licenses/gpl.html * -// * Copyright (C) ZenJu (zhnmju123 AT gmx DOT de) - All Rights Reserved * +// * Copyright (C) ZenJu (zenju AT gmx DOT de) - All Rights Reserved * // ************************************************************************** #ifndef CUSTOMCOMBOBOX_H_INCLUDED @@ -11,6 +11,7 @@ #include <memory> #include <zen/zstring.h> #include <zen/stl_tools.h> +#include <zen/utf.h> //combobox with history function + functionality to delete items (DEL) @@ -30,11 +31,11 @@ public: const std::vector<Zstring>& getList() const { return dirnames_; } - static const Zstring lineSeparator() { return Zstr("---------------------------------------------------------------------------------------------------------------"); } + static const wxString separationLine() { return L"---------------------------------------------------------------------------------------------------------------"; } void addItem(const Zstring& dirname) { - if (dirname.empty() || dirname == lineSeparator()) + if (dirname.empty() || dirname == zen::utfCvrtTo<Zstring>(separationLine())) return; Zstring nameTmp = dirname; @@ -88,6 +89,7 @@ private: void OnKeyEvent(wxKeyEvent& event); void OnMouseWheel(wxMouseEvent& event); void OnSelection(wxCommandEvent& event); + void OnValidateSelection(wxCommandEvent& event); void OnUpdateList(wxEvent& event) { setValueAndUpdateList(GetValue()); event.Skip(); } void setValueAndUpdateList(const wxString& dirname); |