diff options
Diffstat (limited to 'RealtimeSync/application.cpp')
| -rw-r--r-- | RealtimeSync/application.cpp | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/RealtimeSync/application.cpp b/RealtimeSync/application.cpp index 61c9ca96..a7aff305 100644 --- a/RealtimeSync/application.cpp +++ b/RealtimeSync/application.cpp @@ -19,13 +19,13 @@ #include "../lib/return_codes.h" #include "lib/error_log.h" -#ifdef FFS_WIN +#ifdef ZEN_WIN #include <zen/win_ver.h> -#elif defined FFS_LINUX +#elif defined ZEN_LINUX #include <gtk/gtk.h> -#elif defined FFS_MAC +#elif defined ZEN_MAC #include <ApplicationServices/ApplicationServices.h> #endif @@ -43,9 +43,9 @@ void onTerminationRequested() std::wstring msg = boost::this_thread::get_id() == mainThreadId ? L"Termination requested in main thread!\n\n" : L"Termination requested in worker thread!\n\n"; - msg += L"Please take a screenshot and file a bug report at: http://sourceforge.net/projects/freefilesync"; + msg += L"Please file a bug report at: http://sourceforge.net/projects/freefilesync"; - wxSafeShowMessage(_("An exception occurred!"), msg); + wxSafeShowMessage(_("An exception occurred"), msg); std::abort(); } @@ -61,7 +61,7 @@ bool Application::OnInit() { std::set_terminate(onTerminationRequested); //unlike wxWidgets uncaught exception handling, this works for all worker threads -#ifdef FFS_WIN +#ifdef ZEN_WIN #ifdef _MSC_VER _set_invalid_parameter_handler(crtInvalidParameterHandler); //see comment in <zen/time.h> #endif @@ -69,10 +69,10 @@ bool Application::OnInit() //SEM_FAILCRITICALERRORS at startup. This is to prevent error mode dialogs from hanging the application." ::SetErrorMode(SEM_FAILCRITICALERRORS); -#elif defined FFS_LINUX +#elif defined ZEN_LINUX ::gtk_rc_parse((zen::getResourceDir() + "styles.gtk_rc").c_str()); //remove inner border from bitmap buttons -#elif defined FFS_MAC +#elif defined ZEN_MAC ProcessSerialNumber psn = { 0, kCurrentProcess }; ::TransformProcessType(&psn, kProcessTransformToForegroundApplication); //behave like an application bundle, even when the app is not packaged (yet) #endif @@ -148,7 +148,7 @@ int Application::OnRun() { //it's not always possible to display a message box, e.g. corrupted stack, however low-level file output works! logError(utfCvrtTo<std::string>(msg)); - wxSafeShowMessage(_("An exception occurred!") + L" - FFS", msg); + wxSafeShowMessage(_("An exception occurred"), msg); }; try |