Wrap ToolBar stuff with #if wxUSE_TOOLBAR
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24421 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -172,8 +172,10 @@ MyFrame::MyFrame(wxWindow *parent,
|
|||||||
wxDefaultPosition, wxDefaultSize,
|
wxDefaultPosition, wxDefaultSize,
|
||||||
wxTE_MULTILINE | wxSUNKEN_BORDER);
|
wxTE_MULTILINE | wxSUNKEN_BORDER);
|
||||||
|
|
||||||
|
#if wxUSE_TOOLBAR
|
||||||
CreateToolBar(wxNO_BORDER | wxTB_FLAT | wxTB_HORIZONTAL);
|
CreateToolBar(wxNO_BORDER | wxTB_FLAT | wxTB_HORIZONTAL);
|
||||||
InitToolBar(GetToolBar());
|
InitToolBar(GetToolBar());
|
||||||
|
#endif // wxUSE_TOOLBAR
|
||||||
|
|
||||||
// Accelerators
|
// Accelerators
|
||||||
wxAcceleratorEntry entries[3];
|
wxAcceleratorEntry entries[3];
|
||||||
@@ -297,6 +299,7 @@ void MyFrame::OnSize(wxSizeEvent&
|
|||||||
#endif
|
#endif
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#if wxUSE_TOOLBAR
|
||||||
void MyFrame::InitToolBar(wxToolBar* toolBar)
|
void MyFrame::InitToolBar(wxToolBar* toolBar)
|
||||||
{
|
{
|
||||||
wxBitmap* bitmaps[8];
|
wxBitmap* bitmaps[8];
|
||||||
@@ -338,6 +341,7 @@ void MyFrame::InitToolBar(wxToolBar* toolBar)
|
|||||||
for (i = 0; i < 8; i++)
|
for (i = 0; i < 8; i++)
|
||||||
delete bitmaps[i];
|
delete bitmaps[i];
|
||||||
}
|
}
|
||||||
|
#endif // wxUSE_TOOLBAR
|
||||||
|
|
||||||
// ---------------------------------------------------------------------------
|
// ---------------------------------------------------------------------------
|
||||||
// MyCanvas
|
// MyCanvas
|
||||||
|
Reference in New Issue
Block a user