X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/548b53775242a8be5746a455ac74d6d1f1040146..2a45803fc3877afd0ae3ce356dfe216505165882:/include/wx/html/helpwnd.h?ds=sidebyside diff --git a/include/wx/html/helpwnd.h b/include/wx/html/helpwnd.h index be0bc67cd5..c8b05f5614 100644 --- a/include/wx/html/helpwnd.h +++ b/include/wx/html/helpwnd.h @@ -28,13 +28,14 @@ #include "wx/combobox.h" #include "wx/checkbox.h" #include "wx/stattext.h" +#include "wx/hash.h" #include "wx/html/htmlwin.h" #include "wx/html/htmprint.h" -class WXDLLIMPEXP_CORE wxButton; -class WXDLLIMPEXP_CORE wxTextCtrl; -class WXDLLIMPEXP_CORE wxTreeEvent; -class WXDLLIMPEXP_CORE wxTreeCtrl; +class WXDLLIMPEXP_FWD_CORE wxButton; +class WXDLLIMPEXP_FWD_CORE wxTextCtrl; +class WXDLLIMPEXP_FWD_CORE wxTreeEvent; +class WXDLLIMPEXP_FWD_CORE wxTreeCtrl; // style flags for the Help Frame #define wxHF_TOOLBAR 0x0001 @@ -67,8 +68,8 @@ struct wxHtmlHelpFrameCfg struct wxHtmlHelpMergedIndexItem; class wxHtmlHelpMergedIndex; -class WXDLLIMPEXP_CORE wxHelpControllerBase; -class WXDLLIMPEXP_HTML wxHtmlHelpController; +class WXDLLIMPEXP_FWD_CORE wxHelpControllerBase; +class WXDLLIMPEXP_FWD_HTML wxHtmlHelpController; /*! * Help window @@ -91,7 +92,7 @@ public: const wxSize& size = wxDefaultSize, int style = wxTAB_TRAVERSAL|wxNO_BORDER, int helpStyle = wxHF_DEFAULT_STYLE); - ~wxHtmlHelpWindow(); + virtual ~wxHtmlHelpWindow(); wxHtmlHelpData* GetData() { return m_Data; } wxHtmlHelpController* GetController() const { return m_helpController; } @@ -127,6 +128,7 @@ public: bool KeywordSearch(const wxString& keyword, wxHelpSearchMode mode = wxHELP_SEARCH_ALL); +#if wxUSE_CONFIG void UseConfig(wxConfigBase *config, const wxString& rootpath = wxEmptyString) { m_Config = config; @@ -139,6 +141,7 @@ public: // saved values : things set by SetFonts, SetBorders. void ReadCustomization(wxConfigBase *cfg, const wxString& path = wxEmptyString); void WriteCustomization(wxConfigBase *cfg, const wxString& path = wxEmptyString); +#endif // wxUSE_CONFIG // call this to let wxHtmlHelpWindow know page changed void NotifyPageChanged(); @@ -228,8 +231,10 @@ protected: wxHtmlHelpFrameCfg m_Cfg; +#if wxUSE_CONFIG wxConfigBase *m_Config; wxString m_ConfigRoot; +#endif // wxUSE_CONFIG // pagenumbers of controls in notebook (usually 0,1,2) int m_ContentsPage; @@ -258,7 +263,7 @@ private: wxHtmlHelpMergedIndex *m_mergedIndex; DECLARE_EVENT_TABLE() - DECLARE_NO_COPY_CLASS(wxHtmlHelpWindow) + wxDECLARE_NO_COPY_CLASS(wxHtmlHelpWindow); }; /*! @@ -268,7 +273,7 @@ private: enum { //wxID_HTML_HELPFRAME = wxID_HIGHEST + 1, - wxID_HTML_PANEL = wxID_HIGHEST + 2, + wxID_HTML_PANEL = wxID_HIGHEST + 10, wxID_HTML_BACK, wxID_HTML_FORWARD, wxID_HTML_UPNODE, @@ -295,37 +300,6 @@ enum wxID_HTML_COUNTINFO }; -/*! - * Help window event - */ - -class WXDLLIMPEXP_HTML wxHtmlWindowEvent: public wxNotifyEvent -{ -public: - wxHtmlWindowEvent(wxEventType commandType = wxEVT_NULL, int id = 0): - wxNotifyEvent(commandType, id) - { - - } - - void SetURL(const wxString& url) { m_url = url; } - const wxString& GetURL() const { return m_url; } - -private: - wxString m_url; - - DECLARE_DYNAMIC_CLASS(wxHtmlWindowEvent) -}; - -typedef void (wxEvtHandler::*wxHtmlWindowEventFunction)(wxHtmlWindowEvent&); - -BEGIN_DECLARE_EVENT_TYPES() - DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_HTML, - wxEVT_COMMAND_HTMLWINDOW_URL_CLICKED, 1000) -END_DECLARE_EVENT_TYPES() - -#define EVT_HTMLWINDOW_URL_CLICKED(id, fn) DECLARE_EVENT_TABLE_ENTRY( wxEVT_COMMAND_HTMLWINDOW_URL_CLICKED, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxHtmlWindowEventFunction) & fn, (wxObject *) NULL ), - #endif // wxUSE_WXHTML_HELP #endif