Wrap ToolBar stuff with #if wxUSE_TOOLBAR

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24421 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/samples/mdi/mdi.cpp b/samples/mdi/mdi.cpp
index 529f7547928ca8f63bb293d4025e0fa68a212877..21bfdcf75ca8abbb7274f02c4f9649fbc71596e9 100644 (file)
--- a/samples/mdi/mdi.cpp
+++ b/samples/mdi/mdi.cpp
@@ -172,8 +172,10 @@ MyFrame::MyFrame(wxWindow *parent,
                                 wxDefaultPosition, wxDefaultSize,
                                 wxTE_MULTILINE | wxSUNKEN_BORDER);
 
                                 wxDefaultPosition, wxDefaultSize,
                                 wxTE_MULTILINE | wxSUNKEN_BORDER);
 

+#if wxUSE_TOOLBAR

     CreateToolBar(wxNO_BORDER | wxTB_FLAT | wxTB_HORIZONTAL);
     InitToolBar(GetToolBar());
     CreateToolBar(wxNO_BORDER | wxTB_FLAT | wxTB_HORIZONTAL);
     InitToolBar(GetToolBar());

+#endif // wxUSE_TOOLBAR

 
     // Accelerators
     wxAcceleratorEntry entries[3];
 
     // Accelerators
     wxAcceleratorEntry entries[3];


@@ -297,6 +299,7 @@ void MyFrame::OnSize(wxSizeEvent&
 #endif
 }
 
 #endif
 }
 

+#if wxUSE_TOOLBAR

 void MyFrame::InitToolBar(wxToolBar* toolBar)
 {
     wxBitmap* bitmaps[8];
 void MyFrame::InitToolBar(wxToolBar* toolBar)
 {
     wxBitmap* bitmaps[8];


@@ -338,6 +341,7 @@ void MyFrame::InitToolBar(wxToolBar* toolBar)
     for (i = 0; i < 8; i++)
         delete bitmaps[i];
 }
     for (i = 0; i < 8; i++)
         delete bitmaps[i];
 }

+#endif // wxUSE_TOOLBAR

 
 // ---------------------------------------------------------------------------
 // MyCanvas
 
 // ---------------------------------------------------------------------------
 // MyCanvas