diff options
| author | Daniel Wilhelm <daniel@wili.li> | 2014-04-18 17:20:29 +0200 |
|---|---|---|
| committer | Daniel Wilhelm <daniel@wili.li> | 2014-04-18 17:20:29 +0200 |
| commit | b8f13e45be884dc12884ebe8f3dcd9eecb23a106 (patch) | |
| tree | 22a6d8b96815d626061ff3e2d432c13078fca5c4 /ui/sync_cfg.cpp | |
| parent | 5.4 (diff) | |
| download | FreeFileSync-b8f13e45be884dc12884ebe8f3dcd9eecb23a106.tar.gz FreeFileSync-b8f13e45be884dc12884ebe8f3dcd9eecb23a106.tar.bz2 FreeFileSync-b8f13e45be884dc12884ebe8f3dcd9eecb23a106.zip | |
5.5
Diffstat (limited to 'ui/sync_cfg.cpp')
| -rw-r--r-- | ui/sync_cfg.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/ui/sync_cfg.cpp b/ui/sync_cfg.cpp index b88d40f0..794569cc 100644 --- a/ui/sync_cfg.cpp +++ b/ui/sync_cfg.cpp @@ -10,7 +10,6 @@ #include "dir_name.h" #include <wx/wupdlock.h> #include <wx+/mouse_move_dlg.h> -#include <wx+/string_conv.h> #include <wx+/dir_picker.h> #include <wx+/rtl.h> #include "gui_generated.h" @@ -223,7 +222,7 @@ SyncCfgDialog::SyncCfgDialog(wxWindow* parent, //a proper set-method may be in order some time... setEnumVal(enumDelhandDescr, *m_choiceHandleDeletion, syncCfg.handleDeletion); - customDelFolder.setName(toWx(syncCfg.customDeletionDirectory)); + customDelFolder.setName(utfCvrtTo<wxString>(syncCfg.customDeletionDirectory)); updateGui(); //error handling @@ -353,7 +352,7 @@ void SyncCfgDialog::OnApply(wxCommandEvent& event) //write configuration to main dialog syncCfgOut.directionCfg = currentDirectionCfg; syncCfgOut.handleDeletion = getEnumVal(enumDelhandDescr, *m_choiceHandleDeletion); - syncCfgOut.customDeletionDirectory = toZ(customDelFolder.getName()); + syncCfgOut.customDeletionDirectory = utfCvrtTo<Zstring>(customDelFolder.getName()); if (refHandleError) *refHandleError = getEnumVal(enumErrhandDescr, *m_choiceHandleError); |