X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/d3c7fc996a73e9f6a83067bc28a3c5581a3fee65..c3c62822fdda9d340179dec663a806e905882cc9:/include/wx/html/helpwnd.h diff --git a/include/wx/html/helpwnd.h b/include/wx/html/helpwnd.h index 2e718c3fb5..fe5d3aa6dd 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 @@ -295,37 +296,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