X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/76241d0f75d1ede66e828f71d06ea0c38901613c..a721fd82b7ca8c97048453d4aaff559e8f741d69:/include/wx/html/helpwnd.h?ds=sidebyside diff --git a/include/wx/html/helpwnd.h b/include/wx/html/helpwnd.h index a2fbd2224a..fe5d3aa6dd 100644 --- a/include/wx/html/helpwnd.h +++ b/include/wx/html/helpwnd.h @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: helpwnd.h +// Name: wx/html/helpwnd.h // Purpose: wxHtmlHelpWindow // Notes: Based on htmlhelp.cpp, implementing a monolithic // HTML Help controller class, by Vaclav Slavik @@ -9,8 +9,8 @@ // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// -#ifndef _WX_HELPWIN_H_ -#define _WX_HELPWIN_H_ +#ifndef _WX_HELPWND_H_ +#define _WX_HELPWND_H_ #include "wx/defs.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; } @@ -252,6 +253,8 @@ protected: int m_hfStyle; private: + void DoIndexFind(); + void DoIndexAll(); void DisplayIndexItem(const wxHtmlHelpMergedIndexItem *it); wxHtmlHelpMergedIndex *m_mergedIndex; @@ -293,36 +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_EVENT_TYPE(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