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

16
src/html/helpctrl.cpp
View File

@@ -46,16 +46,20 @@ wxHtmlHelpController::wxHtmlHelpController(int style, wxWindow* parentWindow):
m_helpWindow = NULL;
m_helpFrame = NULL;
m_helpDialog = NULL;
#if wxUSE_CONFIG
m_Config = NULL;
m_ConfigRoot = wxEmptyString;
#endif // wxUSE_CONFIG
m_titleFormat = _("Help: %s");
m_FrameStyle = style;
}
wxHtmlHelpController::~wxHtmlHelpController()
{
#if wxUSE_CONFIG
if (m_Config)
WriteCustomization(m_Config, m_ConfigRoot);
#endif // wxUSE_CONFIG
if (m_helpWindow)
DestroyHelpWindow();
}
@@ -85,8 +89,10 @@ void wxHtmlHelpController::DestroyHelpWindow()
void wxHtmlHelpController::OnCloseFrame(wxCloseEvent& evt)
{
#if wxUSE_CONFIG
if (m_Config)
WriteCustomization(m_Config, m_ConfigRoot);
#endif // wxUSE_CONFIG
evt.Skip();
@@ -151,7 +157,11 @@ wxHtmlHelpFrame* wxHtmlHelpController::CreateHelpFrame(wxHtmlHelpData *data)
{
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;
@@ -180,12 +190,14 @@ wxWindow* wxHtmlHelpController::CreateHelpWindow()
return m_helpWindow;
}
#if wxUSE_CONFIG
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)
{
@@ -207,6 +219,7 @@ wxWindow* wxHtmlHelpController::CreateHelpWindow()
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
@@ -229,6 +242,7 @@ void wxHtmlHelpController::UseConfig(wxConfigBase *config, const wxString& rootp
if (m_helpWindow) m_helpWindow->UseConfig(config, rootpath);
ReadCustomization(config, rootpath);
}
#endif // wxUSE_CONFIG
//// Backward compatibility with wxHelpController API

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))

8
src/html/helpwnd.cpp
View File

@@ -273,8 +273,10 @@ void wxHtmlHelpWindow::Init(wxHtmlHelpData* data)
m_mergedIndex = NULL;
#if wxUSE_CONFIG
m_Config = NULL;
m_ConfigRoot = wxEmptyString;
#endif // wxUSE_CONFIG
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;
#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);
#endif // wxUSE_CONFIG
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);
}
#if wxUSE_CONFIG
if ( m_Config )
m_HtmlWin->ReadCustomization(m_Config, m_ConfigRoot);
#endif // wxUSE_CONFIG
// contents tree panel?
if ( helpStyle & wxHF_CONTENTS )
@@ -1069,6 +1075,7 @@ void wxHtmlHelpWindow::RefreshLists()
CreateSearch();
}
#if wxUSE_CONFIG
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);
}
#endif // wxUSE_CONFIG
static void SetFontsToHtmlWin(wxHtmlWindow *win, const wxString& scalf, const wxString& fixf, int size)
{

6
src/html/htmlwin.cpp
View File

@@ -799,8 +799,7 @@ void wxHtmlWindow::CreateLayout()
}
}
#if wxUSE_CONFIG
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);
}
#endif // wxUSE_CONFIG
bool wxHtmlWindow::HistoryBack()
{