X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/be5a51fb592f3fa2ba38ac6cd1e488d6d806058c..dcbbda5451ead669e94e17a2a4d206295bed183b:/samples/layout/layout.cpp

diff --git a/samples/layout/layout.cpp b/samples/layout/layout.cpp
index ad7d19a860..58ce14a866 100644
--- a/samples/layout/layout.cpp
+++ b/samples/layout/layout.cpp
@@ -91,9 +91,10 @@ MyFrame::MyFrame()
   // Associate the menu bar with the frame
   SetMenuBar(menu_bar);
 
+#if wxUSE_STATUSBAR
   CreateStatusBar(2);
   SetStatusText(_T("wxWidgets layout demo"));
-
+#endif // wxUSE_STATUSBAR
 
   // we want to get a dialog that is stretchable because it
   // has a text ctrl in the middle. at the bottom, we have
@@ -146,6 +147,7 @@ MyFrame::MyFrame()
     topsizer->Add(gridsizer, 1, wxGROW | wxALL, 10);
 
 
+#if wxUSE_STATLINE
   // 3) middle: create wxStaticLine with minimum size (3x3)
   topsizer->Add(
      new wxStaticLine( this, wxID_ANY, wxDefaultPosition, wxSize(3,3), wxHORIZONTAL),
@@ -153,6 +155,7 @@ MyFrame::MyFrame()
      wxEXPAND |   // make horizontally stretchable
      wxALL,       //   and make border all around
      5 );         // set border width to 5
+#endif // wxUSE_STATLINE
 
 
   // 4) bottom: create two centred wxButtons
@@ -326,8 +329,7 @@ MySizerDialog::MySizerDialog(wxWindow *parent, const wxChar *title)
     wxBoxSizer *topsizer = new wxBoxSizer( wxVERTICAL );
 
     wxNotebook *notebook = new wxNotebook( this, wxID_ANY );
-    wxNotebookSizer *nbs = new wxNotebookSizer( notebook );
-    topsizer->Add( nbs, 1, wxGROW );
+    topsizer->Add( notebook, 1, wxGROW );
 
     wxButton *button = new wxButton( this, wxID_OK, _T("OK") );
     topsizer->Add( button, 0, wxALIGN_RIGHT | wxALL, 10 );