X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/576507e276a32bccda610ce0e45451e6a46e4d31..61ecf6d34ffb087e4a02d1c4e29e1f155875eba0:/include/wx/html/helpfrm.h diff --git a/include/wx/html/helpfrm.h b/include/wx/html/helpfrm.h index d8c4e83b13..3e0e6e9264 100644 --- a/include/wx/html/helpfrm.h +++ b/include/wx/html/helpfrm.h @@ -12,13 +12,13 @@ #ifndef _WX_HELPFRM_H_ #define _WX_HELPFRM_H_ -#ifdef __GNUG__ +#if defined(__GNUG__) && !defined(__APPLE__) #pragma interface "helpfrm.h" #endif #include "wx/defs.h" -#if wxUSE_HTML +#if wxUSE_WXHTML_HELP #include "wx/html/helpdata.h" #include "wx/window.h" @@ -34,6 +34,9 @@ #include "wx/html/htmlwin.h" #include "wx/html/htmprint.h" +class WXDLLEXPORT wxButton; +class WXDLLEXPORT wxTextCtrl; + // style flags for the Help Frame #define wxHF_TOOLBAR 0x0001 @@ -132,12 +135,12 @@ public: // call this to let wxHtmlHelpFrame know page changed void NotifyPageChanged(); - -protected: - void Init(wxHtmlHelpData* data = NULL); - + // Refreshes Contents and Index tabs void RefreshLists(); + +protected: + void Init(wxHtmlHelpData* data = NULL); // Adds items to m_Contents tree control void CreateContents(); @@ -163,13 +166,13 @@ protected: void OnSearch(wxCommandEvent& event); void OnBookmarksSel(wxCommandEvent& event); void OnCloseWindow(wxCloseEvent& event); + void OnActivate(wxActivateEvent& event); // Images: enum { IMG_Book = 0, IMG_Folder, - IMG_Page, - IMG_RootFolder + IMG_Page }; protected: @@ -179,7 +182,8 @@ protected: // below are various pointers to GUI components wxHtmlWindow *m_HtmlWin; wxSplitterWindow *m_Splitter; - wxNotebook *m_NavigPan; + wxPanel *m_NavigPan; + wxNotebook *m_NavigNotebook; wxTreeCtrl *m_ContentsBox; wxTextCtrl *m_IndexText; wxButton *m_IndexButton; @@ -218,12 +222,12 @@ protected: #endif wxHashTable *m_PagesHash; wxHelpControllerBase* m_helpController; - + int m_hfStyle; DECLARE_EVENT_TABLE() }; -#endif // wxUSE_HTML +#endif // wxUSE_WXHTML_HELP #endif