support retina display

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

diff --git a/include/wx/html/helpwnd.h b/include/wx/html/helpwnd.h
index 42f05b5dc0688c4e8542f3e87fdc2be760dd2a95..c8b05f561442cca3ab086b39334184c6da2d2a4c 100644 (file)
--- a/include/wx/html/helpwnd.h
+++ b/include/wx/html/helpwnd.h
@@ -128,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;


@@ -140,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();


@@ -229,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;


@@ -269,7 +273,7 @@ private:
 enum
 {
     //wxID_HTML_HELPFRAME = wxID_HIGHEST + 1,
 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,
     wxID_HTML_BACK,
     wxID_HTML_FORWARD,
     wxID_HTML_UPNODE,