X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/3957448a34ce9f4860051ba292b35ad70f8fb9db..1e52188741389278cd99abf79218162c87024ba3:/samples/notebook/notebook.cpp?ds=sidebyside

diff --git a/samples/notebook/notebook.cpp b/samples/notebook/notebook.cpp
index 9bfb7e0930..ab4506cbd7 100644
--- a/samples/notebook/notebook.cpp
+++ b/samples/notebook/notebook.cpp
@@ -229,7 +229,7 @@ MyFrame::MyFrame(const wxString& title, const wxPoint& pos, const wxSize& size,
         );
 
     m_panel = new wxPanel(this, -1, wxDefaultPosition, wxDefaultSize,
-        wxTAB_TRAVERSAL | wxCLIP_CHILDREN | wxNO_BORDER);
+        wxTAB_TRAVERSAL | wxCLIP_CHILDREN | wxNO_BORDER | wxNO_FULL_REPAINT_ON_RESIZE);
 
     // Create remaining controls
 
@@ -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_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) );
 
-    // Create the notebook's panels
-    m_notebook->CreateInitialPages();
-
     // 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_notebook->CreateInitialPages();
 
     m_panel->SetSizer(m_sizerFrame);
 
@@ -368,7 +364,7 @@ void MyFrame::ReInitNotebook()
 
     m_notebook = new MyNotebook(m_panel, ID_NOTEBOOK,
                                 wxDefaultPosition, wxDefaultSize,
-                                flags);
+                                flags|wxCLIP_CHILDREN|wxNO_FULL_REPAINT_ON_RESIZE);
 
     if ( m_chkShowImages->IsChecked() )
     {
@@ -384,7 +380,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() );
         }
 
@@ -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();
 }
@@ -429,26 +425,28 @@ BEGIN_EVENT_TABLE(MyFrame, wxFrame)
     EVT_IDLE(MyFrame::OnIdle)
 END_EVENT_TABLE()
 
-void MyFrame::OnCheckOrRadioBox(wxCommandEvent& event)
+void MyFrame::OnCheckOrRadioBox(wxCommandEvent& WXUNUSED(event))
 {
         ReInitNotebook();
 }
 
 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("Button"),
+    (void) new wxButton( panel, -1, wxT("First button"),
         wxPoint(10, 10), wxSize(-1, -1) );
+    (void) new wxButton( panel, -1, wxT("Second button"),
+        wxPoint(50, 100), wxSize(-1, -1) );
 
     m_notebook->AddPage(panel, wxString::Format(ADDED_PAGE_NAME wxT("%u"),
-        ++s_pageAdded), FALSE, m_notebook->GetIconIndex() );
+        ++s_pageAdded), TRUE, m_notebook->GetIconIndex() );
 }
 
 void MyFrame::OnButtonInsertPage( wxCommandEvent& WXUNUSED(event) )
 {
-    static size_t s_pageIns = 0;
+    static unsigned s_pageIns = 0;
 
     wxPanel *panel = m_notebook->CreateUserCreatedPage();
 
@@ -525,7 +523,7 @@ void MyFrame::OnNotebook(wxNotebookEvent& event)
     static int s_numNotebookEvents = 0;
 
     wxLogMessage(wxT("Notebook event #%d: %s (%d)"),
-        s_numNotebookEvents++, str, eventType);
+        s_numNotebookEvents++, str.c_str(), eventType);
 
     m_text->SetInsertionPointEnd();