simplify/cleanup wxTheXXXList and wxGDIObject code (patch 1452023 from Paul Cornett)

[wxWidgets.git] / include / wx / html / helpwnd.h

diff --git a/include/wx/html/helpwnd.h b/include/wx/html/helpwnd.h
index d8f082554c42bf968f17cfe7f2fab0e305b79428..be0bc67cd5305a7be5d391d11d65012a05bfa7a8 100644 (file)
--- 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"
 
@@ -252,6 +252,8 @@ protected:
     int m_hfStyle;
 
 private:
+    void DoIndexFind();
+    void DoIndexAll();
     void DisplayIndexItem(const wxHtmlHelpMergedIndexItem *it);
     wxHtmlHelpMergedIndex *m_mergedIndex;
 
@@ -312,13 +314,14 @@ public:
 private:
     wxString    m_url;
 
-    DECLARE_DYNAMIC_CLASS(wxHtmlWindowEvent);
+    DECLARE_DYNAMIC_CLASS(wxHtmlWindowEvent)
 };
 
 typedef void (wxEvtHandler::*wxHtmlWindowEventFunction)(wxHtmlWindowEvent&);
 
 BEGIN_DECLARE_EVENT_TYPES()
-    DECLARE_EVENT_TYPE(wxEVT_COMMAND_HTMLWINDOW_URL_CLICKED, 1000)
+    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 ),