Replaced Ok() occurrences with IsOk() throughout trunk.

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

diff --git a/include/wx/html/helpwnd.h b/include/wx/html/helpwnd.h
index 5e31933df585c45dbd7a057ff9c35d68accaa6fe..3b80f92fbd3d423ad27fc874f42377185fadf9a6 100644 (file)
--- 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/combobox.h"
 #include "wx/checkbox.h"
 #include "wx/stattext.h"

+#include "wx/hash.h"

 #include "wx/html/htmlwin.h"
 #include "wx/html/htmprint.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
 
 // style flags for the Help Frame
 #define wxHF_TOOLBAR                0x0001


@@ -67,8 +68,8 @@ struct wxHtmlHelpFrameCfg
 struct wxHtmlHelpMergedIndexItem;
 class wxHtmlHelpMergedIndex;
 
 struct wxHtmlHelpMergedIndexItem;
 class wxHtmlHelpMergedIndex;
 

-class WXDLLIMPEXP_CORE wxHelpControllerBase;
-class WXDLLIMPEXP_HTML wxHtmlHelpController;
+class WXDLLIMPEXP_FWD_CORE wxHelpControllerBase;
+class WXDLLIMPEXP_FWD_HTML wxHtmlHelpController;

 
 /*!
  * Help window
 
 /*!
  * Help window


@@ -127,6 +128,7 @@ public:
     bool KeywordSearch(const wxString& keyword,
                        wxHelpSearchMode mode = wxHELP_SEARCH_ALL);
 
     bool KeywordSearch(const wxString& keyword,
                        wxHelpSearchMode mode = wxHELP_SEARCH_ALL);
 

+#if wxUSE_CONFIG

     void UseConfig(wxConfigBase *config, const wxString& rootpath = wxEmptyString)
         {
             m_Config = 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);
     // 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();
 
     // call this to let wxHtmlHelpWindow know page changed
     void NotifyPageChanged();


@@ -228,8 +231,10 @@ protected:
 
     wxHtmlHelpFrameCfg m_Cfg;
 
 
     wxHtmlHelpFrameCfg m_Cfg;
 

+#if wxUSE_CONFIG

     wxConfigBase *m_Config;
     wxString m_ConfigRoot;
     wxConfigBase *m_Config;
     wxString m_ConfigRoot;

+#endif // wxUSE_CONFIG

 
     // pagenumbers of controls in notebook (usually 0,1,2)
     int m_ContentsPage;
 
     // pagenumbers of controls in notebook (usually 0,1,2)
     int m_ContentsPage;


@@ -258,7 +263,7 @@ private:
     wxHtmlHelpMergedIndex *m_mergedIndex;
 
     DECLARE_EVENT_TABLE()
     wxHtmlHelpMergedIndex *m_mergedIndex;
 
     DECLARE_EVENT_TABLE()

-    DECLARE_NO_COPY_CLASS(wxHtmlHelpWindow)
+    wxDECLARE_NO_COPY_CLASS(wxHtmlHelpWindow);

 };
 
 /*!
 };
 
 /*!