Compilation fixes in wxHTML for wxUSE_CONFIG==0.

Surround uses of wxConfig with #of wxUSE_CONFIG in wxHTML code.

Closes #11750.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@63548 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/include/wx/html/helpctrl.h b/include/wx/html/helpctrl.h
index bea865775160fdf2b9304515dfb300a3cb88c1f4..13c346ecb092a9d7afcaca5f65f8f804b5821244 100644 (file)
--- a/include/wx/html/helpctrl.h
+++ b/include/wx/html/helpctrl.h
@@ -66,6 +66,7 @@ public:
     wxHtmlHelpFrame* GetFrame() { return m_helpFrame; }
     wxHtmlHelpDialog* GetDialog() { return m_helpDialog; }
 
     wxHtmlHelpFrame* GetFrame() { return m_helpFrame; }
     wxHtmlHelpDialog* GetDialog() { return m_helpDialog; }
 

+#if wxUSE_CONFIG

     void UseConfig(wxConfigBase *config, const wxString& rootpath = wxEmptyString);
 
     // Assigns config object to the Ctrl. This config is then
     void UseConfig(wxConfigBase *config, const wxString& rootpath = wxEmptyString);
 
     // Assigns config object to the Ctrl. This config is then


@@ -73,6 +74,7 @@ public:
     // Ctrl and it's wxHtmlWindow
     virtual void ReadCustomization(wxConfigBase *cfg, const wxString& path = wxEmptyString);
     virtual void WriteCustomization(wxConfigBase *cfg, const wxString& path = wxEmptyString);
     // Ctrl and it's wxHtmlWindow
     virtual void ReadCustomization(wxConfigBase *cfg, const wxString& path = wxEmptyString);
     virtual void WriteCustomization(wxConfigBase *cfg, const wxString& path = wxEmptyString);

+#endif // wxUSE_CONFIG

 
     //// Backward compatibility with wxHelpController API
 
 
     //// Backward compatibility with wxHelpController API
 


@@ -118,8 +120,10 @@ protected:
 
     wxHtmlHelpData      m_helpData;
     wxHtmlHelpWindow*   m_helpWindow;
 
     wxHtmlHelpData      m_helpData;
     wxHtmlHelpWindow*   m_helpWindow;

+#if wxUSE_CONFIG

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

+#endif // wxUSE_CONFIG

     wxString            m_titleFormat;
     int                 m_FrameStyle;
     wxHtmlHelpFrame*    m_helpFrame;
     wxString            m_titleFormat;
     int                 m_FrameStyle;
     wxHtmlHelpFrame*    m_helpFrame;

diff --git a/include/wx/html/helpfrm.h b/include/wx/html/helpfrm.h
index 4bdbbc708d7c226683c688d87dbd5da2644ccf1d..a678ef60a8ca9f1b848214fa72224d25c52954b4 100644 (file)
--- a/include/wx/html/helpfrm.h
+++ b/include/wx/html/helpfrm.h
@@ -74,11 +74,17 @@ public:
     wxHtmlHelpFrame(wxHtmlHelpData* data = NULL) { Init(data); }
     wxHtmlHelpFrame(wxWindow* parent, wxWindowID wxWindowID,
                     const wxString& title = wxEmptyString,
     wxHtmlHelpFrame(wxHtmlHelpData* data = NULL) { Init(data); }
     wxHtmlHelpFrame(wxWindow* parent, wxWindowID wxWindowID,
                     const wxString& title = wxEmptyString,

-                    int style = wxHF_DEFAULT_STYLE, wxHtmlHelpData* data = NULL,
-                    wxConfigBase *config=NULL, const wxString& rootpath = wxEmptyString);
+                    int style = wxHF_DEFAULT_STYLE, wxHtmlHelpData* data = NULL
+#if wxUSE_CONFIG
+                    , wxConfigBase *config=NULL, const wxString& rootpath = wxEmptyString
+#endif // wxUSE_CONFIG
+                    );

     bool Create(wxWindow* parent, wxWindowID id, const wxString& title = wxEmptyString,
     bool Create(wxWindow* parent, wxWindowID id, const wxString& title = wxEmptyString,

-                int style = wxHF_DEFAULT_STYLE,
-                wxConfigBase *config=NULL, const wxString& rootpath = wxEmptyString);
+                int style = wxHF_DEFAULT_STYLE
+#if wxUSE_CONFIG
+                , wxConfigBase *config=NULL, const wxString& rootpath = wxEmptyString
+#endif // wxUSE_CONFIG
+                );

     virtual ~wxHtmlHelpFrame();
 
     /// Returns the data associated with the window.
     virtual ~wxHtmlHelpFrame();
 
     /// Returns the data associated with the window.


@@ -97,8 +103,10 @@ public:
     // (for title of displayed HTML page)
     void SetTitleFormat(const wxString& format);
 
     // (for title of displayed HTML page)
     void SetTitleFormat(const wxString& format);
 

+#if wxUSE_CONFIG

     // For compatibility
     void UseConfig(wxConfigBase *config, const wxString& rootpath = wxEmptyString);
     // For compatibility
     void UseConfig(wxConfigBase *config, const wxString& rootpath = wxEmptyString);

+#endif // wxUSE_CONFIG

 
     // Make the help controller's frame 'modal' if
     // needed
 
     // Make the help controller's frame 'modal' if
     // needed

diff --git a/include/wx/html/helpwnd.h b/include/wx/html/helpwnd.h
index 42f05b5dc0688c4e8542f3e87fdc2be760dd2a95..3b80f92fbd3d423ad27fc874f42377185fadf9a6 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;

diff --git a/include/wx/html/htmlwin.h b/include/wx/html/htmlwin.h
index c5ab33c1545b21c9be09a8a1c52dde759effc268..88a48f7184d6e6ba1d87e81d5d8f3ecbbe54edb1 100644 (file)
--- a/include/wx/html/htmlwin.h
+++ b/include/wx/html/htmlwin.h
@@ -318,12 +318,14 @@ public:
     // when/if we have CSS support we could add other possibilities...)
     void SetBackgroundImage(const wxBitmap& bmpBg) { m_bmpBg = bmpBg; }
 
     // when/if we have CSS support we could add other possibilities...)
     void SetBackgroundImage(const wxBitmap& bmpBg) { m_bmpBg = bmpBg; }
 

+#if wxUSE_CONFIG

     // Saves custom settings into cfg config. it will use the path 'path'
     // if given, otherwise it will save info into currently selected path.
     // saved values : things set by SetFonts, SetBorders.
     virtual void ReadCustomization(wxConfigBase *cfg, wxString path = wxEmptyString);
     // ...
     virtual void WriteCustomization(wxConfigBase *cfg, wxString path = wxEmptyString);
     // Saves custom settings into cfg config. it will use the path 'path'
     // if given, otherwise it will save info into currently selected path.
     // saved values : things set by SetFonts, SetBorders.
     virtual void ReadCustomization(wxConfigBase *cfg, wxString path = wxEmptyString);
     // ...
     virtual void WriteCustomization(wxConfigBase *cfg, wxString path = wxEmptyString);

+#endif // wxUSE_CONFIG

 
     // Goes to previous/next page (in browsing history)
     // Returns true if successful, false otherwise
 
     // Goes to previous/next page (in browsing history)
     // Returns true if successful, false otherwise

diff --git a/src/html/helpctrl.cpp b/src/html/helpctrl.cpp
index d1d37b38010397a0eb21fd43bbe886e26826b5ba..d093b99b731a83eca918c0f59848032f41b36238 100644 (file)
--- a/src/html/helpctrl.cpp
+++ b/src/html/helpctrl.cpp
@@ -46,16 +46,20 @@ wxHtmlHelpController::wxHtmlHelpController(int style, wxWindow* parentWindow):
     m_helpWindow = NULL;
     m_helpFrame = NULL;
     m_helpDialog = NULL;
     m_helpWindow = NULL;
     m_helpFrame = NULL;
     m_helpDialog = NULL;

+#if wxUSE_CONFIG

     m_Config = NULL;
     m_ConfigRoot = wxEmptyString;
     m_Config = NULL;
     m_ConfigRoot = wxEmptyString;

+#endif // wxUSE_CONFIG

     m_titleFormat = _("Help: %s");
     m_FrameStyle = style;
 }
 
 wxHtmlHelpController::~wxHtmlHelpController()
 {
     m_titleFormat = _("Help: %s");
     m_FrameStyle = style;
 }
 
 wxHtmlHelpController::~wxHtmlHelpController()
 {

+#if wxUSE_CONFIG

     if (m_Config)
         WriteCustomization(m_Config, m_ConfigRoot);
     if (m_Config)
         WriteCustomization(m_Config, m_ConfigRoot);

+#endif // wxUSE_CONFIG

     if (m_helpWindow)
         DestroyHelpWindow();
 }
     if (m_helpWindow)
         DestroyHelpWindow();
 }


@@ -85,8 +89,10 @@ void wxHtmlHelpController::DestroyHelpWindow()
 
 void wxHtmlHelpController::OnCloseFrame(wxCloseEvent& evt)
 {
 
 void wxHtmlHelpController::OnCloseFrame(wxCloseEvent& evt)
 {

+#if wxUSE_CONFIG

     if (m_Config)
         WriteCustomization(m_Config, m_ConfigRoot);
     if (m_Config)
         WriteCustomization(m_Config, m_ConfigRoot);

+#endif // wxUSE_CONFIG

 
     evt.Skip();
 
 
     evt.Skip();
 


@@ -151,7 +157,11 @@ wxHtmlHelpFrame* wxHtmlHelpController::CreateHelpFrame(wxHtmlHelpData *data)
 {
     wxHtmlHelpFrame* frame = new wxHtmlHelpFrame(data);
     frame->SetController(this);
 {
     wxHtmlHelpFrame* frame = new wxHtmlHelpFrame(data);
     frame->SetController(this);

-    frame->Create(m_parentWindow, -1, wxEmptyString, m_FrameStyle, m_Config, m_ConfigRoot);
+    frame->Create(m_parentWindow, -1, wxEmptyString, m_FrameStyle
+#if wxUSE_CONFIG
+        , m_Config, m_ConfigRoot
+#endif // wxUSE_CONFIG
+        );

     frame->SetTitleFormat(m_titleFormat);
     m_helpFrame = frame;
     return frame;
     frame->SetTitleFormat(m_titleFormat);
     m_helpFrame = frame;
     return frame;


@@ -180,12 +190,14 @@ wxWindow* wxHtmlHelpController::CreateHelpWindow()
         return m_helpWindow;
     }
 
         return m_helpWindow;
     }
 

+#if wxUSE_CONFIG

     if (m_Config == NULL)
     {
         m_Config = wxConfigBase::Get(false);
         if (m_Config != NULL)
             m_ConfigRoot = wxT("wxWindows/wxHtmlHelpController");
     }
     if (m_Config == NULL)
     {
         m_Config = wxConfigBase::Get(false);
         if (m_Config != NULL)
             m_ConfigRoot = wxT("wxWindows/wxHtmlHelpController");
     }

+#endif // wxUSE_CONFIG

 
     if (m_FrameStyle & wxHF_DIALOG)
     {
 
     if (m_FrameStyle & wxHF_DIALOG)
     {


@@ -207,6 +219,7 @@ wxWindow* wxHtmlHelpController::CreateHelpWindow()
     return m_helpWindow;
 }
 
     return m_helpWindow;
 }
 

+#if wxUSE_CONFIG

 void wxHtmlHelpController::ReadCustomization(wxConfigBase* cfg, const wxString& path)
 {
     /* should not be called by the user; call UseConfig, and the controller
 void wxHtmlHelpController::ReadCustomization(wxConfigBase* cfg, const wxString& path)
 {
     /* should not be called by the user; call UseConfig, and the controller


@@ -229,6 +242,7 @@ void wxHtmlHelpController::UseConfig(wxConfigBase *config, const wxString& rootp
     if (m_helpWindow) m_helpWindow->UseConfig(config, rootpath);
     ReadCustomization(config, rootpath);
 }
     if (m_helpWindow) m_helpWindow->UseConfig(config, rootpath);
     ReadCustomization(config, rootpath);
 }

+#endif // wxUSE_CONFIG

 
 //// Backward compatibility with wxHelpController API
 
 
 //// Backward compatibility with wxHelpController API
 

diff --git a/src/html/helpfrm.cpp b/src/html/helpfrm.cpp
index 12437a80e3e1dac3c36f498122247aeb05edf703..9020ad8b55bcb8d4f5b2c12c992014003533ed4b 100644 (file)
--- a/src/html/helpfrm.cpp
+++ b/src/html/helpfrm.cpp
@@ -69,11 +69,18 @@ BEGIN_EVENT_TABLE(wxHtmlHelpFrame, wxFrame)
 END_EVENT_TABLE()
 
 wxHtmlHelpFrame::wxHtmlHelpFrame(wxWindow* parent, wxWindowID id, const wxString& title,
 END_EVENT_TABLE()
 
 wxHtmlHelpFrame::wxHtmlHelpFrame(wxWindow* parent, wxWindowID id, const wxString& title,

-                                 int style, wxHtmlHelpData* data,
-                                 wxConfigBase *config, const wxString& rootpath)
+                                 int style, wxHtmlHelpData* data
+#if wxUSE_CONFIG
+                                 , wxConfigBase *config, const wxString& rootpath
+#endif // wxUSE_CONFIG
+                                 )

 {
     Init(data);
 {
     Init(data);

-    Create(parent, id, title, style, config, rootpath);
+    Create(parent, id, title, style
+#if wxUSE_CONFIG
+        , config, rootpath
+#endif // wxUSE_CONFIG
+        );

 }
 
 void wxHtmlHelpFrame::Init(wxHtmlHelpData* data)
 }
 
 void wxHtmlHelpFrame::Init(wxHtmlHelpData* data)


@@ -93,13 +100,18 @@ void wxHtmlHelpFrame::SetController(wxHtmlHelpController* controller)
 
 // Create: builds the GUI components.
 bool wxHtmlHelpFrame::Create(wxWindow* parent, wxWindowID id,
 
 // Create: builds the GUI components.
 bool wxHtmlHelpFrame::Create(wxWindow* parent, wxWindowID id,

-                             const wxString& WXUNUSED(title), int style,
-                             wxConfigBase *config, const wxString& rootpath)
+                             const wxString& WXUNUSED(title), int style
+#if wxUSE_CONFIG
+                             , wxConfigBase *config, const wxString& rootpath
+#endif // wxUSE_CONFIG
+                             )

 {
     m_HtmlHelpWin = new wxHtmlHelpWindow(m_Data);
     m_HtmlHelpWin->SetController(m_helpController);
 {
     m_HtmlHelpWin = new wxHtmlHelpWindow(m_Data);
     m_HtmlHelpWin->SetController(m_helpController);

-    if ( config)
+#if wxUSE_CONFIG
+    if ( config )

         m_HtmlHelpWin->UseConfig(config, rootpath);
         m_HtmlHelpWin->UseConfig(config, rootpath);

+#endif // wxUSE_CONFIG

 
     wxFrame::Create(parent, id, _("Help"),
                     wxPoint(m_HtmlHelpWin->GetCfgData().x, m_HtmlHelpWin->GetCfgData().y),
 
     wxFrame::Create(parent, id, _("Help"),
                     wxPoint(m_HtmlHelpWin->GetCfgData().x, m_HtmlHelpWin->GetCfgData().y),


@@ -225,12 +237,14 @@ void wxHtmlHelpFrame::AddGrabIfNeeded()
 #endif // __WXGTK__
 }
 
 #endif // __WXGTK__
 }
 

+#if wxUSE_CONFIG

 // For compatibility
 void wxHtmlHelpFrame::UseConfig(wxConfigBase *config, const wxString& rootPath)
 {
     if (m_HtmlHelpWin)
         m_HtmlHelpWin->UseConfig(config, rootPath);
 }
 // For compatibility
 void wxHtmlHelpFrame::UseConfig(wxConfigBase *config, const wxString& rootPath)
 {
     if (m_HtmlHelpWin)
         m_HtmlHelpWin->UseConfig(config, rootPath);
 }

+#endif // wxUSE_CONFIG

 
 #ifdef __WXMAC__
 void wxHtmlHelpFrame::OnClose(wxCommandEvent& WXUNUSED(event))
 
 #ifdef __WXMAC__
 void wxHtmlHelpFrame::OnClose(wxCommandEvent& WXUNUSED(event))

diff --git a/src/html/helpwnd.cpp b/src/html/helpwnd.cpp
index 1bce8024efef2ec96918b8c63737548b11154b13..1cc2f9d8f9ca2b8d215ee40c039f5ee6b4e78ae3 100644 (file)
--- a/src/html/helpwnd.cpp
+++ b/src/html/helpwnd.cpp
@@ -273,8 +273,10 @@ void wxHtmlHelpWindow::Init(wxHtmlHelpData* data)
 
     m_mergedIndex = NULL;
 
 
     m_mergedIndex = NULL;
 

+#if wxUSE_CONFIG

     m_Config = NULL;
     m_ConfigRoot = wxEmptyString;
     m_Config = NULL;
     m_ConfigRoot = wxEmptyString;

+#endif // wxUSE_CONFIG

 
     m_Cfg.x = m_Cfg.y = wxDefaultCoord;
     m_Cfg.w = 700;
 
     m_Cfg.x = m_Cfg.y = wxDefaultCoord;
     m_Cfg.w = 700;


@@ -315,10 +317,12 @@ bool wxHtmlHelpWindow::Create(wxWindow* parent, wxWindowID id,
 {
     m_hfStyle = helpStyle;
 
 {
     m_hfStyle = helpStyle;
 

+#if wxUSE_CONFIG

     // Do the config in two steps. We read the HtmlWindow customization after we
     // create the window.
     if (m_Config)
         ReadCustomization(m_Config, m_ConfigRoot);
     // Do the config in two steps. We read the HtmlWindow customization after we
     // create the window.
     if (m_Config)
         ReadCustomization(m_Config, m_ConfigRoot);

+#endif // wxUSE_CONFIG

 
     wxWindow::Create(parent, id, pos, size, style, wxT("wxHtmlHelp"));
 
 
     wxWindow::Create(parent, id, pos, size, style, wxT("wxHtmlHelp"));
 


@@ -393,8 +397,10 @@ bool wxHtmlHelpWindow::Create(wxWindow* parent, wxWindowID id,
         topWindowSizer->Add(m_HtmlWin, 1, wxEXPAND);
     }
 
         topWindowSizer->Add(m_HtmlWin, 1, wxEXPAND);
     }
 

+#if wxUSE_CONFIG

     if ( m_Config )
         m_HtmlWin->ReadCustomization(m_Config, m_ConfigRoot);
     if ( m_Config )
         m_HtmlWin->ReadCustomization(m_Config, m_ConfigRoot);

+#endif // wxUSE_CONFIG

 
     // contents tree panel?
     if ( helpStyle & wxHF_CONTENTS )
 
     // contents tree panel?
     if ( helpStyle & wxHF_CONTENTS )


@@ -1069,6 +1075,7 @@ void wxHtmlHelpWindow::RefreshLists()
     CreateSearch();
 }
 
     CreateSearch();
 }
 

+#if wxUSE_CONFIG

 void wxHtmlHelpWindow::ReadCustomization(wxConfigBase *cfg, const wxString& path)
 {
     wxString oldpath;
 void wxHtmlHelpWindow::ReadCustomization(wxConfigBase *cfg, const wxString& path)
 {
     wxString oldpath;


@@ -1174,6 +1181,7 @@ void wxHtmlHelpWindow::WriteCustomization(wxConfigBase *cfg, const wxString& pat
     if (path != wxEmptyString)
         cfg->SetPath(oldpath);
 }
     if (path != wxEmptyString)
         cfg->SetPath(oldpath);
 }

+#endif // wxUSE_CONFIG

 
 static void SetFontsToHtmlWin(wxHtmlWindow *win, const wxString& scalf, const wxString& fixf, int size)
 {
 
 static void SetFontsToHtmlWin(wxHtmlWindow *win, const wxString& scalf, const wxString& fixf, int size)
 {

diff --git a/src/html/htmlwin.cpp b/src/html/htmlwin.cpp
index 2b0e4b96cbe41d930b29a865cdf9b361ed72ce14..f61561184fa8b7aae5fbb7dfdbd757dcde79e17b 100644 (file)
--- a/src/html/htmlwin.cpp
+++ b/src/html/htmlwin.cpp
@@ -799,8 +799,7 @@ void wxHtmlWindow::CreateLayout()
     }
 }
 
     }
 }
 

-
-
+#if wxUSE_CONFIG

 void wxHtmlWindow::ReadCustomization(wxConfigBase *cfg, wxString path)
 {
     wxString oldpath;
 void wxHtmlWindow::ReadCustomization(wxConfigBase *cfg, wxString path)
 {
     wxString oldpath;


@@ -853,8 +852,7 @@ void wxHtmlWindow::WriteCustomization(wxConfigBase *cfg, wxString path)
     if (path != wxEmptyString)
         cfg->SetPath(oldpath);
 }
     if (path != wxEmptyString)
         cfg->SetPath(oldpath);
 }

-
-
+#endif // wxUSE_CONFIG

 
 bool wxHtmlWindow::HistoryBack()
 {
 
 bool wxHtmlWindow::HistoryBack()
 {