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
This commit is contained in:
@@ -66,6 +66,7 @@ public:
|
||||
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
|
||||
@@ -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);
|
||||
#endif // wxUSE_CONFIG
|
||||
|
||||
//// Backward compatibility with wxHelpController API
|
||||
|
||||
@@ -118,8 +120,10 @@ protected:
|
||||
|
||||
wxHtmlHelpData m_helpData;
|
||||
wxHtmlHelpWindow* m_helpWindow;
|
||||
#if wxUSE_CONFIG
|
||||
wxConfigBase * m_Config;
|
||||
wxString m_ConfigRoot;
|
||||
#endif // wxUSE_CONFIG
|
||||
wxString m_titleFormat;
|
||||
int m_FrameStyle;
|
||||
wxHtmlHelpFrame* m_helpFrame;
|
||||
|
Reference in New Issue
Block a user