diff options
Diffstat (limited to 'FreeFileSync/Source/RealTimeSync/application.cpp')
-rw-r--r-- | FreeFileSync/Source/RealTimeSync/application.cpp | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/FreeFileSync/Source/RealTimeSync/application.cpp b/FreeFileSync/Source/RealTimeSync/application.cpp index 37a5aa19..729b0e49 100644 --- a/FreeFileSync/Source/RealTimeSync/application.cpp +++ b/FreeFileSync/Source/RealTimeSync/application.cpp @@ -9,13 +9,13 @@ #include <zen/file_access.h> #include <zen/thread.h> #include <zen/shutdown.h> +#include <zen/resolve_path.h> #include <wx/event.h> #include <wx/log.h> #include <wx/tooltip.h> #include <wx+/popup_dlg.h> #include <wx+/image_resources.h> #include "config.h" -#include "../base/resolve_path.h" #include "../localization.h" #include "../ffs_paths.h" #include "../return_codes.h" @@ -117,17 +117,6 @@ bool Application::OnInit() } -int Application::OnExit() -{ - fff::releaseWxLocale(); - imageResourcesCleanup(); - return wxApp::OnExit(); -} - - -wxLayoutDirection Application::GetLayoutDirection() const { return fff::getLayoutDirection(); } - - void Application::onEnterEventLoop(wxEvent& event) { [[maybe_unused]] bool ubOk = Unbind(EVENT_ENTER_EVENT_LOOP, &Application::onEnterEventLoop, this); @@ -137,7 +126,7 @@ void Application::onEnterEventLoop(wxEvent& event) std::vector<Zstring> commandArgs; for (int i = 1; i < argc; ++i) { - Zstring filePath = fff::getResolvedFilePath(utfTo<Zstring>(argv[i])); + Zstring filePath = getResolvedFilePath(utfTo<Zstring>(argv[i])); if (!fileAvailable(filePath)) //be a little tolerant { @@ -162,6 +151,17 @@ void Application::onEnterEventLoop(wxEvent& event) } +int Application::OnExit() +{ + fff::releaseWxLocale(); + imageResourcesCleanup(); + return wxApp::OnExit(); +} + + +wxLayoutDirection Application::GetLayoutDirection() const { return fff::getLayoutDirection(); } + + int Application::OnRun() { [[maybe_unused]] const int rc = wxApp::OnRun(); |