X-Git-Url: http://Server1/repobrowser/?p=xestiaab%2F.git;a=blobdiff_plain;f=source%2FfrmMain.cpp;h=f07a5ca1f736bc6aff7c6ef2fefae2b9f3b2dbce;hp=bfef19678372531dab2ebd6c07a288e08128912b;hb=76214fdd5e820c60a468a62fa586749102310f21;hpb=18215b188e882f4e02887d9bf0c6b68b900795a6 diff --git a/source/frmMain.cpp b/source/frmMain.cpp index bfef196..f07a5ca 100644 --- a/source/frmMain.cpp +++ b/source/frmMain.cpp @@ -48,7 +48,7 @@ #include "frmSSLCertificate.h" #include "frmUpdate.h" #include "import/frmImportResults.h" -#include "bitmaps.h" +#include "Bitmaps.h" #include "common/preferences.h" #include "common/getcontactinfo.h" @@ -407,6 +407,10 @@ void frmMain::QuitApp() SetFilename.Append(wxT("settings")); +#elif defined(__APPLE__) + + TerminateHelpBrowserProcess(); + #else // *nix OSes @@ -3127,14 +3131,16 @@ void frmMain::ShowHelp( wxCommandEvent& event ){ #if defined(__HAIKU__) #elif defined(__WIN32__) - + +#elif defined(__APPLE__) + DisplayHelpBrowser(); + return; #else // Get the LANG environment variable char *languageEnvironmentVariableChar = getenv("LANG"); std::string languageEnvironmentVariable(languageEnvironmentVariableChar); - std::cout << wxString(languageEnvironmentVariable).BeforeFirst('.', nullptr).ToStdString() << std::endl; int executeResult = 0; @@ -3174,7 +3180,7 @@ void frmMain::ShowHelp( wxCommandEvent& event ){ } if (executeResult == 0) - return; + return; #endif