X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/b5dbe15d0bacde245539f54c4d97af6b4696f01f..a4301b8f14d21b7d28fc4f6a247b740d945ca6dc:/include/wx/html/helpwnd.h

diff --git a/include/wx/html/helpwnd.h b/include/wx/html/helpwnd.h
index cfe0bad1a6..c8b05f5614 100644
--- a/include/wx/html/helpwnd.h
+++ b/include/wx/html/helpwnd.h
@@ -28,6 +28,7 @@
 #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"
 
@@ -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,