reSWIGged

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

diff --git a/samples/notebook/notebook.cpp b/samples/notebook/notebook.cpp
index 5fdf6a136e7b66d6cd423d052bbdf3400f4f8aaf..01ed0558dd1b45c8e8e89b86580e7f78a1ed78ec 100644 (file)
--- a/samples/notebook/notebook.cpp
+++ b/samples/notebook/notebook.cpp
@@ -161,11 +161,9 @@ wxPanel *MyNotebook::CreateInsertPage()
 
 void MyNotebook::CreateInitialPages()
 {
-    wxPanel *panel = (wxPanel *) NULL;
-
     // Create and add some panels to the notebook
 
-    panel = CreateRadioButtonsPage();
+    wxPanel *panel = CreateRadioButtonsPage();
     AddPage( panel, RADIOBUTTONS_PAGE_NAME, FALSE, GetIconIndex() );
 
     panel = CreateVetoPage();
@@ -380,7 +378,7 @@ void MyFrame::ReInitNotebook()
         {
             wxString str = notebook->GetPageText(n);
 
-            wxNotebookPage *page = m_notebook->CreatePage(str);
+            wxWindow *page = m_notebook->CreatePage(str);
             m_notebook->AddPage(page, str, FALSE, m_notebook->GetIconIndex() );
         }
 
@@ -400,7 +398,7 @@ void MyFrame::ReInitNotebook()
     }
 
 
-    m_sizerNotebook = new wxNotebookSizer(m_notebook);
+    m_sizerNotebook = new wxBookCtrlSizer(m_notebook);
     m_sizerTop->Add(m_sizerNotebook, 1, wxEXPAND | wxALL, 4);
     m_sizerTop->Layout();
 }