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

26
src/html/helpfrm.cpp
View File

@@ -69,11 +69,18 @@ BEGIN_EVENT_TABLE(wxHtmlHelpFrame, wxFrame)
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);
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)
@@ -93,13 +100,18 @@ void wxHtmlHelpFrame::SetController(wxHtmlHelpController* controller)
// 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);
if ( config)
#if wxUSE_CONFIG
if ( config )
m_HtmlHelpWin->UseConfig(config, rootpath);
#endif // wxUSE_CONFIG
wxFrame::Create(parent, id, _("Help"),
wxPoint(m_HtmlHelpWin->GetCfgData().x, m_HtmlHelpWin->GetCfgData().y),
@@ -225,12 +237,14 @@ void wxHtmlHelpFrame::AddGrabIfNeeded()
#endif // __WXGTK__
}
#if wxUSE_CONFIG
// 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))