Fixes for wxUSE_STATUSBAR.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@28310 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -189,11 +189,15 @@ MyFrame::MyFrame(const wxString& title, const wxPoint& pos, const wxSize& size)
|
||||
// ... and attach this menu bar to the frame
|
||||
SetMenuBar(menuBar);
|
||||
|
||||
#if wxUSE_STATUSBAR
|
||||
CreateStatusBar(1);
|
||||
#endif // wxUSE_STATUSBAR
|
||||
|
||||
m_Html = new wxHtmlWindow(this);
|
||||
m_Html -> SetRelatedFrame(this, _("HTML : %s"));
|
||||
#if wxUSE_STATUSBAR
|
||||
m_Html -> SetRelatedStatusBar(0);
|
||||
#endif // wxUSE_STATUSBAR
|
||||
m_Name = wxT("test.htm");
|
||||
m_Html -> LoadPage(m_Name);
|
||||
|
||||
|
@@ -184,13 +184,17 @@ MyFrame::MyFrame(const wxString& title, const wxPoint& pos, const wxSize& size)
|
||||
SetAcceleratorTable(accel);
|
||||
#endif // wxUSE_ACCEL
|
||||
|
||||
#if wxUSE_STATUSBAR
|
||||
CreateStatusBar(1);
|
||||
#endif // wxUSE_STATUSBAR
|
||||
|
||||
m_Processor = new BoldProcessor;
|
||||
m_Processor->Enable(false);
|
||||
m_Html = new wxHtmlWindow(this);
|
||||
m_Html->SetRelatedFrame(this, _("HTML : %s"));
|
||||
#if wxUSE_STATUSBAR
|
||||
m_Html->SetRelatedStatusBar(0);
|
||||
#endif // wxUSE_STATUSBAR
|
||||
m_Html->ReadCustomization(wxConfig::Get());
|
||||
m_Html->LoadFile(wxFileName(wxT("test.htm")));
|
||||
m_Html->AddProcessor(m_Processor);
|
||||
|
@@ -202,11 +202,15 @@ wxHtmlWindow *html;
|
||||
// ... and attach this menu bar to the frame
|
||||
SetMenuBar(menuBar);
|
||||
|
||||
#if wxUSE_STATUSBAR
|
||||
CreateStatusBar(2);
|
||||
#endif // wxUSE_STATUSBAR
|
||||
|
||||
html = new wxHtmlWindow(this);
|
||||
html -> SetRelatedFrame(this, _("VFS Demo: '%s'"));
|
||||
#if wxUSE_STATUSBAR
|
||||
html -> SetRelatedStatusBar(1);
|
||||
#endif // wxUSE_STATUSBAR
|
||||
html -> LoadPage(wxT("start.htm"));
|
||||
}
|
||||
|
||||
|
@@ -193,11 +193,15 @@ MyFrame::MyFrame(const wxString& title, const wxPoint& pos, const wxSize& size)
|
||||
// ... and attach this menu bar to the frame
|
||||
SetMenuBar(menuBar);
|
||||
|
||||
#if wxUSE_STATUSBAR
|
||||
CreateStatusBar(2);
|
||||
#endif // wxUSE_STATUSBAR
|
||||
|
||||
html = new wxHtmlWindow(this);
|
||||
html -> SetRelatedFrame(this, _("VFS Demo: '%s'"));
|
||||
#if wxUSE_STATUSBAR
|
||||
html -> SetRelatedStatusBar(1);
|
||||
#endif // wxUSE_STATUSBAR
|
||||
html -> LoadPage(wxT("start.htm"));
|
||||
}
|
||||
|
||||
|
@@ -153,14 +153,16 @@ MyFrame::MyFrame(const wxString& title, const wxPoint& pos, const wxSize& size)
|
||||
// ... and attach this menu bar to the frame
|
||||
SetMenuBar(menuBar);
|
||||
|
||||
#if wxUSE_STATUSBAR
|
||||
CreateStatusBar(1);
|
||||
#endif // wxUSE_STATUSBAR
|
||||
|
||||
{
|
||||
html = new wxHtmlWindow(this);
|
||||
html -> SetRelatedFrame(this, _("HTML : %s"));
|
||||
#if wxUSE_STATUSBAR
|
||||
html -> SetRelatedStatusBar(0);
|
||||
#endif // wxUSE_STATUSBAR
|
||||
html -> LoadPage(wxT("start.htm"));
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
|
Reference in New Issue
Block a user