made --cppflags return -DwxUSE_GUI=0 when used with --libs=base

[wxWidgets.git] / samples / notebook / notebook.cpp

diff --git a/samples/notebook/notebook.cpp b/samples/notebook/notebook.cpp
index 3839145a0612106866cb2dc9ceb513c8df5fec66..5e0d05be50a008448f98f213712704386554376a 100644 (file)
--- a/samples/notebook/notebook.cpp
+++ b/samples/notebook/notebook.cpp
@@ -315,8 +315,6 @@ MyFrame::MyFrame(const wxString& title, const wxPoint& pos, const wxSize& size,
 
     m_panel->SetSizer(m_sizerFrame);
 
 
     m_panel->SetSizer(m_sizerFrame);
 

-    m_panel->SetAutoLayout(true);
-

     m_sizerFrame->Fit(this);
     m_sizerFrame->SetSizeHints(this);
 
     m_sizerFrame->Fit(this);
     m_sizerFrame->SetSizeHints(this);
 


@@ -392,11 +390,8 @@ void MyFrame::ReInitNotebook()
             m_notebook->AddPage(page, str, false, m_notebook->GetIconIndex() );
         }
 
             m_notebook->AddPage(page, str, false, m_notebook->GetIconIndex() );
         }
 

-        if (m_sizerNotebook)
-        {
-            m_sizerTop->Remove(m_sizerNotebook);
-        }
-
+        m_sizerTop->Remove(notebook);
+        

         delete notebook;
 
         // restore selection
         delete notebook;
 
         // restore selection


@@ -408,8 +403,7 @@ void MyFrame::ReInitNotebook()
     }
 
 
     }
 
 

-    m_sizerNotebook = new wxBookCtrlSizer(m_notebook);
-    m_sizerTop->Add(m_sizerNotebook, 1, wxEXPAND | wxALL, 4);
+    m_sizerTop->Add(m_notebook, 1, wxEXPAND | wxALL, 4);

     m_sizerTop->Layout();
 }
 
     m_sizerTop->Layout();
 }