Wrap some toolbar code in #if wxUSE_TOOLBAR
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24420 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -282,6 +282,7 @@ bool wxHtmlHelpFrame::Create(wxWindow* parent, wxWindowID id,
|
|||||||
|
|
||||||
CreateStatusBar();
|
CreateStatusBar();
|
||||||
|
|
||||||
|
#if wxUSE_TOOLBAR
|
||||||
// toolbar?
|
// toolbar?
|
||||||
if (style & (wxHF_TOOLBAR | wxHF_FLAT_TOOLBAR))
|
if (style & (wxHF_TOOLBAR | wxHF_FLAT_TOOLBAR))
|
||||||
{
|
{
|
||||||
@@ -292,6 +293,7 @@ bool wxHtmlHelpFrame::Create(wxWindow* parent, wxWindowID id,
|
|||||||
AddToolbarButtons(toolBar, style);
|
AddToolbarButtons(toolBar, style);
|
||||||
toolBar->Realize();
|
toolBar->Realize();
|
||||||
}
|
}
|
||||||
|
#endif //wxUSE_TOOLBAR
|
||||||
|
|
||||||
wxSizer *navigSizer = NULL;
|
wxSizer *navigSizer = NULL;
|
||||||
|
|
||||||
@@ -507,6 +509,7 @@ wxHtmlHelpFrame::~wxHtmlHelpFrame()
|
|||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
#if wxUSE_TOOLBAR
|
||||||
void wxHtmlHelpFrame::AddToolbarButtons(wxToolBar *toolBar, int style)
|
void wxHtmlHelpFrame::AddToolbarButtons(wxToolBar *toolBar, int style)
|
||||||
{
|
{
|
||||||
wxBitmap wpanelBitmap =
|
wxBitmap wpanelBitmap =
|
||||||
@@ -579,6 +582,7 @@ void wxHtmlHelpFrame::AddToolbarButtons(wxToolBar *toolBar, int style)
|
|||||||
FALSE, -1, -1, (wxObject *) NULL,
|
FALSE, -1, -1, (wxObject *) NULL,
|
||||||
_("Display options dialog"));
|
_("Display options dialog"));
|
||||||
}
|
}
|
||||||
|
#endif //wxUSE_TOOLBAR
|
||||||
|
|
||||||
|
|
||||||
void wxHtmlHelpFrame::SetTitleFormat(const wxString& format)
|
void wxHtmlHelpFrame::SetTitleFormat(const wxString& format)
|
||||||
|
Reference in New Issue
Block a user