Don't require skipping "page changed" event in wxMSW wxNotebook.

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

diff --git a/samples/notebook/notebook.cpp b/samples/notebook/notebook.cpp
index 0c46b7f54db575c6313c15e00e4ab5842d29f60e..39533d2175a8d8a0dda6cd9a4c315cb6721d39b0 100644 (file)
--- a/samples/notebook/notebook.cpp
+++ b/samples/notebook/notebook.cpp
@@ -6,7 +6,7 @@
 // Created:     26/10/98
 // RCS-ID:      $Id$
 // Copyright:   (c) 1998-2002 wxWidgets team
-// License:     wxWindows license
+// Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // For compilers that support precompilation, includes "wx.h".
@@ -89,14 +89,14 @@ wxPanel *CreateRadioButtonsPage(wxBookCtrlBase *parent)
     panel->SetHelpText( wxT( "Panel with some Radio Buttons" ) );
 #endif
 
-    wxString animals[] = 
+    wxString animals[] =
       { wxT("Fox"), wxT("Hare"), wxT("Rabbit"),
         wxT("Sabre-toothed tiger"), wxT("T Rex") };
 
     wxRadioBox *radiobox1 = new wxRadioBox(panel, wxID_ANY, wxT("Choose one"),
         wxDefaultPosition, wxDefaultSize, 5, animals, 2, wxRA_SPECIFY_ROWS);
 
-    wxString computers[] = 
+    wxString computers[] =
       { wxT("Amiga"), wxT("Commodore 64"), wxT("PET"),
         wxT("Another") };
 
@@ -121,7 +121,7 @@ wxPanel *CreateVetoPage(wxBookCtrlBase *parent)
 #endif
 
     (void) new wxStaticText( panel, wxID_ANY,
-                             wxT("This page intentionally left blank"), 
+                             wxT("This page intentionally left blank"),
                              wxPoint(10, 10) );
 
     return panel;
@@ -154,7 +154,7 @@ wxPanel *CreateInsertPage(wxBookCtrlBase *parent)
 
     panel->SetBackgroundColour( wxColour( wxT("MAROON") ) );
     (void) new wxStaticText( panel, wxID_ANY,
-                             wxT("This page has been inserted, not added."), 
+                             wxT("This page has been inserted, not added."),
                              wxPoint(10, 10) );
 
     return panel;
@@ -291,6 +291,8 @@ MyFrame::MyFrame()
     m_type = Type_Listbook;
 #elif wxUSE_TREEBOOK
     m_type = Type_Treebook;
+#elif wxUSE_TOOLBOOK
+    m_type = Type_Toolbook;
 #else
     #error "Don't use Notebook sample without any book enabled in wxWidgets build!"
 #endif
@@ -322,11 +324,11 @@ MyFrame::MyFrame()
     menuType->Check(ID_BOOK_NOTEBOOK + m_type, true);
 
     wxMenu *menuOrient = new wxMenu;
-    menuOrient->AppendRadioItem(ID_ORIENT_DEFAULT, wxT("&Default\tCtrl-5"));
-    menuOrient->AppendRadioItem(ID_ORIENT_TOP,     wxT("&Top\tCtrl-6"));
-    menuOrient->AppendRadioItem(ID_ORIENT_BOTTOM,  wxT("&Bottom\tCtrl-7"));
-    menuOrient->AppendRadioItem(ID_ORIENT_LEFT,    wxT("&Left\tCtrl-8"));
-    menuOrient->AppendRadioItem(ID_ORIENT_RIGHT,   wxT("&Right\tCtrl-9"));
+    menuOrient->AppendRadioItem(ID_ORIENT_DEFAULT, wxT("&Default\tAlt-0"));
+    menuOrient->AppendRadioItem(ID_ORIENT_TOP,     wxT("&Top\tAlt-1"));
+    menuOrient->AppendRadioItem(ID_ORIENT_BOTTOM,  wxT("&Bottom\tAlt-2"));
+    menuOrient->AppendRadioItem(ID_ORIENT_LEFT,    wxT("&Left\tAlt-3"));
+    menuOrient->AppendRadioItem(ID_ORIENT_RIGHT,   wxT("&Right\tAlt-4"));
 
     wxMenu *menuPageOperations = new wxMenu;
     menuPageOperations->Append(ID_ADD_PAGE, wxT("&Add page\tAlt-A"));
@@ -402,10 +404,11 @@ MyFrame::MyFrame()
     RecreateBook();
 
     m_panel->SetSizer(m_sizerFrame);
+    m_panel->Layout();
 
-    m_sizerFrame->SetSizeHints(this);
-
-    Centre(wxBOTH);
+    wxBoxSizer *sizer = new wxBoxSizer(wxVERTICAL);
+    sizer->Add(m_panel, wxSizerFlags(1).Expand());
+    SetSizerAndFit(sizer);
 }
 
 MyFrame::~MyFrame()
@@ -578,7 +581,7 @@ void MyFrame::RecreateBook()
     m_sizerFrame->Layout();
 }
 
-void MyFrame::AddFlagStrIfFlagPresent(wxString & flagStr, long flags, long flag, 
+void MyFrame::AddFlagStrIfFlagPresent(wxString & flagStr, long flags, long flag,
                                       const wxChar * flagName) const
 {
     if( (flags & flag) == flag )