diff options
| author | Daniel Wilhelm <daniel@wili.li> | 2014-04-18 16:55:48 +0200 |
|---|---|---|
| committer | Daniel Wilhelm <daniel@wili.li> | 2014-04-18 16:55:48 +0200 |
| commit | daea231de0ae28fc8343f29f09d0457cc0591461 (patch) | |
| tree | a1d572442d2c903e40741a859ad47c8b0d740969 /ui/SyncDialog.cpp | |
| parent | 1.13 (diff) | |
| download | FreeFileSync-daea231de0ae28fc8343f29f09d0457cc0591461.tar.gz FreeFileSync-daea231de0ae28fc8343f29f09d0457cc0591461.tar.bz2 FreeFileSync-daea231de0ae28fc8343f29f09d0457cc0591461.zip | |
1.14
Diffstat (limited to 'ui/SyncDialog.cpp')
| -rw-r--r-- | ui/SyncDialog.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/ui/SyncDialog.cpp b/ui/SyncDialog.cpp index a26931fe..67ec27dc 100644 --- a/ui/SyncDialog.cpp +++ b/ui/SyncDialog.cpp @@ -564,7 +564,7 @@ void BatchDialog::OnCreateBatchJob(wxCommandEvent& event) fileName = filePicker->GetPath(); if (wxFileExists(fileName)) { - wxMessageDialog* messageDlg = new wxMessageDialog(this, wxString(wxT("\"")) + fileName + wxT("\"") + _(" already exists. Overwrite?"), _("Warning") , wxOK | wxCANCEL); + wxMessageDialog* messageDlg = new wxMessageDialog(this, wxString(_("File already exists. Overwrite?")) + wxT(" \"") + fileName + wxT("\""), _("Warning") , wxOK | wxCANCEL); if (messageDlg->ShowModal() != wxID_OK) return; @@ -599,8 +599,8 @@ bool BatchDialog::createBatchFile(const wxString& filename) for (unsigned int i = 0; i < localFolderPairs.size(); ++i) { FolderPair newPair; - newPair.leftDirectory = localFolderPairs[i]->m_directoryLeft->GetValue(); - newPair.rightDirectory = localFolderPairs[i]->m_directoryRight->GetValue(); + newPair.leftDirectory = localFolderPairs[i]->m_directoryLeft->GetValue().c_str(); + newPair.rightDirectory = localFolderPairs[i]->m_directoryRight->GetValue().c_str(); batchCfg.directoryPairs.push_back(newPair); } @@ -624,7 +624,7 @@ bool BatchDialog::createBatchFile(const wxString& filename) /* #ifdef FFS_WIN -#include <windows.h> +#include <wx/msw/wrapwin.h> //includes "windows.h" #include <shlobj.h> #endif // FFS_WIN |