X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/1d6fcbcc7088e9c104b3dc5b4704a07f728d55ae..07792edb2e6f47ea9c59a0eea56c4906fc40043c:/samples/notebook/notebook.cpp

diff --git a/samples/notebook/notebook.cpp b/samples/notebook/notebook.cpp
index 4e5737b60f..b38e860528 100644
--- a/samples/notebook/notebook.cpp
+++ b/samples/notebook/notebook.cpp
@@ -34,6 +34,9 @@ IMPLEMENT_APP(MyApp)
 
 bool MyApp::OnInit()
 {
+    if ( !wxApp::OnInit() )
+        return false;
+
 #if wxUSE_HELP
     wxHelpProvider::Set( new wxSimpleHelpProvider );
 #endif
@@ -256,6 +259,7 @@ MyFrame::MyFrame()
 
     wxMenu *menuPageOperations = new wxMenu;
     menuPageOperations->Append(ID_ADD_PAGE, wxT("&Add page\tAlt-A"));
+    menuPageOperations->Append(ID_ADD_PAGE_NO_SELECT, wxT("&Add page (don't select)\tAlt-B"));
     menuPageOperations->Append(ID_INSERT_PAGE, wxT("&Insert page\tAlt-I"));
     menuPageOperations->Append(ID_DELETE_CUR_PAGE, wxT("&Delete current page\tAlt-D"));
     menuPageOperations->Append(ID_DELETE_LAST_PAGE, wxT("D&elete last page\tAlt-L"));
@@ -328,7 +332,6 @@ MyFrame::MyFrame()
 
     m_panel->SetSizer(m_sizerFrame);
 
-    m_sizerFrame->Fit(this);
     m_sizerFrame->SetSizeHints(this);
 
     Centre(wxBOTH);
@@ -426,7 +429,6 @@ void MyFrame::RecreateBook()
 
     if ( m_multi && m_type == Type_Notebook )
         flags |= wxNB_MULTILINE;
-    flags |= wxDOUBLE_BORDER;
 
     wxBookCtrlBase *oldBook = m_bookCtrl;
 
@@ -515,6 +517,7 @@ BEGIN_EVENT_TABLE(MyFrame, wxFrame)
 
     // Operations menu
     EVT_MENU(ID_ADD_PAGE, MyFrame::OnAddPage)
+    EVT_MENU(ID_ADD_PAGE_NO_SELECT, MyFrame::OnAddPageNoSelect)
     EVT_MENU(ID_INSERT_PAGE, MyFrame::OnInsertPage)
     EVT_MENU(ID_DELETE_CUR_PAGE, MyFrame::OnDeleteCurPage)
     EVT_MENU(ID_DELETE_LAST_PAGE, MyFrame::OnDeleteLastPage)
@@ -601,7 +604,7 @@ void MyFrame::OnHitTest(wxCommandEvent& WXUNUSED(event))
 
 void MyFrame::OnType(wxCommandEvent& event)
 {
-    m_type = wx_static_cast(BookType, event.GetId() - ID_BOOK_NOTEBOOK);
+    m_type = static_cast<BookType>(event.GetId() - ID_BOOK_NOTEBOOK);
 
     if ( m_bookCtrl )
         m_sizerFrame->Hide(m_bookCtrl);
@@ -678,6 +681,24 @@ void MyFrame::OnAddPage(wxCommandEvent& WXUNUSED(event))
     }
 }
 
+void MyFrame::OnAddPageNoSelect(wxCommandEvent& WXUNUSED(event))
+{
+    wxBookCtrlBase *currBook = GetCurrentBook();
+
+    if ( currBook )
+    {
+        static unsigned s_pageAdded = 0;
+        currBook->AddPage(CreateNewPage(),
+                          wxString::Format
+                          (
+                            ADDED_PAGE_NAME wxT("%u"),
+                            ++s_pageAdded
+                          ),
+                          false,
+                          GetIconIndex(currBook));
+    }
+}
+
 #if wxUSE_TREEBOOK
 void MyFrame::OnAddSubPage(wxCommandEvent& WXUNUSED(event))
 {
@@ -898,7 +919,7 @@ void MyFrame::OnBookCtrl(wxBookCtrlBaseEvent& event)
             // NB: can't use wxStaticCast here as wxBookCtrlBase is not in
             //     wxRTTI
             const wxBookCtrlBase * const
-                book = wx_static_cast(wxBookCtrlBase *, event.GetEventObject());
+                book = static_cast<wxBookCtrlBase *>(event.GetEventObject());
             if ( idx != wxNOT_FOUND &&
                     book && book->GetPageText(idx) == VETO_PAGE_NAME )
             {