X-Git-Url: http://Server1/repobrowser/?p=xestiaab%2F.git;a=blobdiff_plain;f=source%2FfrmMain.h;h=2e7613f52767a9934684f6f47856d50e96e4edf2;hp=59b4c54d2ff433694f9d80c11dea1162a13a49a8;hb=HEAD;hpb=974a0d586c5480559439d4756c3ce5fb3876da0c diff --git a/source/frmMain.h b/source/frmMain.h index 59b4c54..2e7613f 100644 --- a/source/frmMain.h +++ b/source/frmMain.h @@ -48,7 +48,7 @@ Subclass of frmMainADT, which is generated by wxFormBuilder. #include "common/events.h" #include "common/etag.h" #include "common/structs.h" -#include "bitmaps.h" +#include "Bitmaps.h" #include "common/sslcertstructs.h" #include "widgets/XABContactMenu.h" #include "widgets/XABAccountView.h" @@ -125,6 +125,7 @@ class frmMain : public frmMainADT std::map AccountAccDirList; #if defined(__APPLE__) std::map AccountTrustData; + NSRunningApplication *helpBrowserProcess = nil; #elif defined(__WIN32__) std::map AccountCertificateData; #else @@ -196,6 +197,8 @@ class frmMain : public frmMainADT #if defined(__APPLE__) void DisplayCertificate(SecTrustRef SecurityTrustObject); void DisplayTrustPanel( wxCommandEvent& event ); + void DisplayHelpBrowser(); + void TerminateHelpBrowserProcess(); #endif protected: // Handlers for frmMainADT events. @@ -206,7 +209,7 @@ class frmMain : public frmMainADT void OpenPreferences( wxCommandEvent& event ); void OpenNewABDialog( wxCommandEvent& event ); void LoadPreferences( wxActivateEvent& event ); - void LoadPreferences(); + void LoadPreferences(bool skipWindowSizeReload); void ShowContactInfo( wxListEvent& event ); void OpenContactInfoList( wxListEvent& event ); void OpenContactInfoList( wxCommandEvent& event );