Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compilation fixes in wxHTML for wxUSE_CONFIG==0.

Browse Source 
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:
Vadim Zeitlin
2010-02-25 00:03:30 +00:00
parent 83b4d26c14
commit b42468496c
8 changed files with 67 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
include/wx/html/helpctrl.h
View File

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

16
include/wx/html/helpfrm.h
View File

@@ -74,11 +74,17 @@ public:
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,
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.
@@ -97,8 +103,10 @@ public:
// (for title of displayed HTML page)
void SetTitleFormat(const wxString& format);
#if wxUSE_CONFIG
// For compatibility
void UseConfig(wxConfigBase *config, const wxString& rootpath = wxEmptyString);
#endif // wxUSE_CONFIG
// Make the help controller's frame 'modal' if
// needed

4
include/wx/html/helpwnd.h
View File

@@ -128,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;
@@ -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);
#endif // wxUSE_CONFIG
// call this to let wxHtmlHelpWindow know page changed
void NotifyPageChanged();
@@ -229,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;

2
include/wx/html/htmlwin.h
View File

@@ -318,12 +318,14 @@ public:
// 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);
#endif // wxUSE_CONFIG
// Goes to previous/next page (in browsing history)
// Returns true if successful, false otherwise