regenerated with DESTDIR fixes

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

diff --git a/samples/notebook/notebook.cpp b/samples/notebook/notebook.cpp
index cf7f04fcb37bcb95ea4ff9d5a116eff509d2fef4..ab4506cbd726fe8761d337a068e79c96c6cdf66f 100644 (file)
--- a/samples/notebook/notebook.cpp
+++ b/samples/notebook/notebook.cpp
@@ -274,16 +274,11 @@ MyFrame::MyFrame(const wxString& title, const wxPoint& pos, const wxSize& size,
     m_btnExit = new wxButton( m_panel, wxID_OK, wxT("&Exit") );
     m_btnExit->SetDefault();
 
     m_btnExit = new wxButton( m_panel, wxID_OK, wxT("&Exit") );
     m_btnExit->SetDefault();
 

-    m_notebook = new MyNotebook(m_panel, ID_NOTEBOOK);
-

     m_text = new wxTextCtrl(m_panel, -1, wxEmptyString,
         wxDefaultPosition, wxDefaultSize, wxTE_MULTILINE | wxTE_READONLY);
 
     m_logTargetOld = wxLog::SetActiveTarget( new wxLogTextCtrl(m_text) );
 
     m_text = new wxTextCtrl(m_panel, -1, wxEmptyString,
         wxDefaultPosition, wxDefaultSize, wxTE_MULTILINE | wxTE_READONLY);
 
     m_logTargetOld = wxLog::SetActiveTarget( new wxLogTextCtrl(m_text) );
 

-    // Create the notebook's panels
-    m_notebook->CreateInitialPages();
-

     // Set sizers
     m_sizerFrame = new wxBoxSizer(wxVERTICAL);
 
     // Set sizers
     m_sizerFrame = new wxBoxSizer(wxVERTICAL);
 


@@ -314,6 +309,7 @@ MyFrame::MyFrame(const wxString& title, const wxPoint& pos, const wxSize& size,
     m_sizerFrame->Add(m_text, 0, wxEXPAND);
 
     ReInitNotebook();
     m_sizerFrame->Add(m_text, 0, wxEXPAND);
 
     ReInitNotebook();

+    m_notebook->CreateInitialPages();

 
     m_panel->SetSizer(m_sizerFrame);
 
 
     m_panel->SetSizer(m_sizerFrame);
 


@@ -384,7 +380,7 @@ void MyFrame::ReInitNotebook()
         {
             wxString str = notebook->GetPageText(n);
 
         {
             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() );
         }
 
             m_notebook->AddPage(page, str, FALSE, m_notebook->GetIconIndex() );
         }
 


@@ -404,7 +400,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();
 }
     m_sizerTop->Add(m_sizerNotebook, 1, wxEXPAND | wxALL, 4);
     m_sizerTop->Layout();
 }


@@ -436,7 +432,7 @@ void MyFrame::OnCheckOrRadioBox(wxCommandEvent& WXUNUSED(event))
 
 void MyFrame::OnButtonAddPage( wxCommandEvent& WXUNUSED(event) )
 {
 
 void MyFrame::OnButtonAddPage( wxCommandEvent& WXUNUSED(event) )
 {

-    static size_t s_pageAdded = 0;
+    static unsigned s_pageAdded = 0;

 
     wxPanel *panel = new wxPanel( m_notebook, -1 );
     (void) new wxButton( panel, -1, wxT("First button"),
 
     wxPanel *panel = new wxPanel( m_notebook, -1 );
     (void) new wxButton( panel, -1, wxT("First button"),


@@ -450,7 +446,7 @@ void MyFrame::OnButtonAddPage( wxCommandEvent& WXUNUSED(event) )
 
 void MyFrame::OnButtonInsertPage( wxCommandEvent& WXUNUSED(event) )
 {
 
 void MyFrame::OnButtonInsertPage( wxCommandEvent& WXUNUSED(event) )
 {

-    static size_t s_pageIns = 0;
+    static unsigned s_pageIns = 0;

 
     wxPanel *panel = m_notebook->CreateUserCreatedPage();
 
 
     wxPanel *panel = m_notebook->CreateUserCreatedPage();