diff options
| author | Daniel Wilhelm <daniel@wili.li> | 2014-04-18 17:11:09 +0200 |
|---|---|---|
| committer | Daniel Wilhelm <daniel@wili.li> | 2014-04-18 17:11:09 +0200 |
| commit | 9cc790869ed3905c78c7eeeb0bb44f800b3f2af4 (patch) | |
| tree | 1c085bbf2302be294866c4fc6e0d225f8abbc346 /comparison.cpp | |
| parent | 3.14 (diff) | |
| download | FreeFileSync-9cc790869ed3905c78c7eeeb0bb44f800b3f2af4.tar.gz FreeFileSync-9cc790869ed3905c78c7eeeb0bb44f800b3f2af4.tar.bz2 FreeFileSync-9cc790869ed3905c78c7eeeb0bb44f800b3f2af4.zip | |
3.15
Diffstat (limited to 'comparison.cpp')
| -rw-r--r-- | comparison.cpp | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/comparison.cpp b/comparison.cpp index 80ecacc0..b1e60eae 100644 --- a/comparison.cpp +++ b/comparison.cpp @@ -7,8 +7,7 @@ #include "comparison.h" #include <stdexcept> #include "shared/global_func.h" -#include <wx/intl.h> -//#include <wx/timer.h> +#include "shared/i18n.h" #include <wx/msgdlg.h> #include <wx/log.h> #include "algorithm.h" @@ -16,6 +15,7 @@ #include <memory> #include "shared/string_conv.h" #include "shared/file_handling.h" +#include "shared/resolve_path.h" #include "shared/system_func.h" #include "shared/file_traverser.h" #include "library/filter.h" @@ -639,9 +639,7 @@ void CompareProcess::startCompareProcess(const std::vector<FolderPairCfg>& direc wxLogNull noWxLogs; //hide wxWidgets log messages in release build #endif - // #ifdef FFS_WIN //PERF_START; - // #endif //init process: keep at beginning so that all gui elements are initialized properly |