fill in the fields of wxListItem in a wxListEvent before handling the event (closes...

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

diff --git a/samples/notebook/notebook.cpp b/samples/notebook/notebook.cpp
index a3d0d45d72d84eb52ca04133373a9b76cdf3fb70..63116dd9167fba23671e77fe9f765d712224154a 100644 (file)
--- a/samples/notebook/notebook.cpp
+++ b/samples/notebook/notebook.cpp
@@ -30,12 +30,24 @@
     #include "../sample.xpm"
 #endif
 
     #include "../sample.xpm"
 #endif
 

+//-----------------------------------------------------------------------------
+// MyApp
+//-----------------------------------------------------------------------------
+

 IMPLEMENT_APP(MyApp)
 
 bool MyApp::OnInit()
 {
 IMPLEMENT_APP(MyApp)
 
 bool MyApp::OnInit()
 {

+    if ( !wxApp::OnInit() )
+        return false;
+
+#if wxUSE_HELP
+    wxHelpProvider::Set( new wxSimpleHelpProvider );
+#endif
+

     // Create the main window
     MyFrame *frame = new MyFrame();
     // Create the main window
     MyFrame *frame = new MyFrame();

+    SetTopWindow(frame);

 
     // Problem with generic wxNotebook implementation whereby it doesn't size
     // properly unless you set the size again
 
     // Problem with generic wxNotebook implementation whereby it doesn't size
     // properly unless you set the size again


@@ -50,12 +62,21 @@ bool MyApp::OnInit()
     return true;
 }
 
     return true;
 }
 

+
+//-----------------------------------------------------------------------------
+// Creation functions
+//-----------------------------------------------------------------------------
+

 wxPanel *CreateUserCreatedPage(wxBookCtrlBase *parent)
 {
     wxPanel *panel = new wxPanel(parent);
 
 wxPanel *CreateUserCreatedPage(wxBookCtrlBase *parent)
 {
     wxPanel *panel = new wxPanel(parent);
 

+#if wxUSE_HELP
+    panel->SetHelpText( wxT( "Panel with a Button" ) );
+#endif
+

     (void) new wxButton( panel, wxID_ANY, wxT("Button"),
     (void) new wxButton( panel, wxID_ANY, wxT("Button"),

-        wxPoint(10, 10), wxDefaultSize );
+                         wxPoint(10, 10), wxDefaultSize );

 
     return panel;
 }
 
     return panel;
 }


@@ -64,13 +85,19 @@ wxPanel *CreateRadioButtonsPage(wxBookCtrlBase *parent)
 {
     wxPanel *panel = new wxPanel(parent);
 
 {
     wxPanel *panel = new wxPanel(parent);
 

-    wxString animals[] = { wxT("Fox"), wxT("Hare"), wxT("Rabbit"),
+#if wxUSE_HELP
+    panel->SetHelpText( wxT( "Panel with some Radio Buttons" ) );
+#endif
+
+    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);
 
         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[] = { wxT("Amiga"), wxT("Commodore 64"), wxT("PET"),
+    wxString computers[] = 
+      { wxT("Amiga"), wxT("Commodore 64"), wxT("PET"),

         wxT("Another") };
 
     wxRadioBox *radiobox2 = new wxRadioBox(panel, wxID_ANY,
         wxT("Another") };
 
     wxRadioBox *radiobox2 = new wxRadioBox(panel, wxID_ANY,


@@ -89,8 +116,13 @@ wxPanel *CreateVetoPage(wxBookCtrlBase *parent)
 {
     wxPanel *panel = new wxPanel(parent);
 
 {
     wxPanel *panel = new wxPanel(parent);
 

+#if wxUSE_HELP
+    panel->SetHelpText( wxT( "An empty panel" ) );
+#endif
+

     (void) new wxStaticText( panel, wxID_ANY,
     (void) new wxStaticText( panel, wxID_ANY,

-        wxT("This page intentionally left blank"), wxPoint(10, 10) );
+                             wxT("This page intentionally left blank"), 
+                             wxPoint(10, 10) );

 
     return panel;
 }
 
     return panel;
 }


@@ -99,6 +131,10 @@ wxPanel *CreateBigButtonPage(wxBookCtrlBase *parent)
 {
     wxPanel *panel = new wxPanel(parent);
 
 {
     wxPanel *panel = new wxPanel(parent);
 

+#if wxUSE_HELP
+    panel->SetHelpText( wxT( "Panel with a maximized button" ) );
+#endif
+

     wxButton *buttonBig = new wxButton(panel, wxID_ANY, wxT("Maximized button"));
 
     wxBoxSizer *sizerPanel = new wxBoxSizer(wxVERTICAL);
     wxButton *buttonBig = new wxButton(panel, wxID_ANY, wxT("Maximized button"));
 
     wxBoxSizer *sizerPanel = new wxBoxSizer(wxVERTICAL);


@@ -108,14 +144,18 @@ wxPanel *CreateBigButtonPage(wxBookCtrlBase *parent)
     return panel;
 }
 
     return panel;
 }
 

-

 wxPanel *CreateInsertPage(wxBookCtrlBase *parent)
 {
     wxPanel *panel = new wxPanel(parent);
 
 wxPanel *CreateInsertPage(wxBookCtrlBase *parent)
 {
     wxPanel *panel = new wxPanel(parent);
 

+#if wxUSE_HELP
+    panel->SetHelpText( wxT( "Maroon panel" ) );
+#endif
+

     panel->SetBackgroundColour( wxColour( wxT("MAROON") ) );
     (void) new wxStaticText( panel, wxID_ANY,
     panel->SetBackgroundColour( wxColour( wxT("MAROON") ) );
     (void) new wxStaticText( panel, wxID_ANY,

-        wxT("This page has been inserted, not added."), wxPoint(10, 10) );
+                             wxT("This page has been inserted, not added."), 
+                             wxPoint(10, 10) );

 
     return panel;
 }
 
     return panel;
 }


@@ -178,9 +218,71 @@ wxPanel *CreatePage(wxBookCtrlBase *parent, const wxString&pageName)
     return NULL;
 }
 
     return NULL;
 }
 

+
+//-----------------------------------------------------------------------------
+// MyFrame
+//-----------------------------------------------------------------------------
+
+BEGIN_EVENT_TABLE(MyFrame, wxFrame)
+    // File menu
+    EVT_MENU_RANGE(ID_BOOK_NOTEBOOK, ID_BOOK_MAX, MyFrame::OnType)
+    EVT_MENU_RANGE(ID_ORIENT_DEFAULT, ID_ORIENT_MAX, MyFrame::OnOrient)
+    EVT_MENU(ID_SHOW_IMAGES, MyFrame::OnShowImages)
+    EVT_MENU(ID_MULTI, MyFrame::OnMulti)
+    EVT_MENU(wxID_EXIT, MyFrame::OnExit)
+
+    // 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)
+    EVT_MENU(ID_NEXT_PAGE, MyFrame::OnNextPage)
+    EVT_MENU(ID_GO_HOME, MyFrame::OnGoHome)
+
+#if wxUSE_HELP
+    EVT_MENU(ID_CONTEXT_HELP, MyFrame::OnContextHelp)
+#endif // wxUSE_HELP
+    EVT_MENU(ID_HITTEST, MyFrame::OnHitTest)
+
+    // Book controls
+#if wxUSE_NOTEBOOK
+    EVT_NOTEBOOK_PAGE_CHANGED(wxID_ANY, MyFrame::OnNotebook)
+    EVT_NOTEBOOK_PAGE_CHANGING(wxID_ANY, MyFrame::OnNotebook)
+#endif
+#if wxUSE_LISTBOOK
+    EVT_LISTBOOK_PAGE_CHANGED(wxID_ANY, MyFrame::OnListbook)
+    EVT_LISTBOOK_PAGE_CHANGING(wxID_ANY, MyFrame::OnListbook)
+#endif
+#if wxUSE_CHOICEBOOK
+    EVT_CHOICEBOOK_PAGE_CHANGED(wxID_ANY, MyFrame::OnChoicebook)
+    EVT_CHOICEBOOK_PAGE_CHANGING(wxID_ANY, MyFrame::OnChoicebook)
+#endif
+#if wxUSE_TREEBOOK
+    EVT_TREEBOOK_PAGE_CHANGED(wxID_ANY, MyFrame::OnTreebook)
+    EVT_TREEBOOK_PAGE_CHANGING(wxID_ANY, MyFrame::OnTreebook)
+
+    EVT_MENU(ID_ADD_SUB_PAGE, MyFrame::OnAddSubPage)
+    EVT_MENU(ID_ADD_PAGE_BEFORE, MyFrame::OnAddPageBefore)
+    EVT_UPDATE_UI_RANGE(ID_ADD_PAGE_BEFORE, ID_ADD_SUB_PAGE,
+                            MyFrame::OnUpdateTreeMenu)
+#endif
+#if wxUSE_TOOLBOOK
+    EVT_TOOLBOOK_PAGE_CHANGED(wxID_ANY, MyFrame::OnToolbook)
+    EVT_TOOLBOOK_PAGE_CHANGING(wxID_ANY, MyFrame::OnToolbook)
+#endif
+
+    // Update title in idle time
+    EVT_IDLE(MyFrame::OnIdle)
+END_EVENT_TABLE()
+

 MyFrame::MyFrame()
 MyFrame::MyFrame()

-    : wxFrame(NULL, wxID_ANY,  wxString(wxT("wxWidgets book controls sample")))
+    : wxFrame(NULL, wxID_ANY, wxString(wxT("wxWidgets book controls sample")))

 {
 {

+#if wxUSE_HELP
+    SetExtraStyle(wxFRAME_EX_CONTEXTHELP);
+#endif // wxUSE_HELP
+

 #if wxUSE_NOTEBOOK
     m_type = Type_Notebook;
 #elif wxUSE_CHOICEBOOK
 #if wxUSE_NOTEBOOK
     m_type = Type_Notebook;
 #elif wxUSE_CHOICEBOOK


@@ -228,6 +330,7 @@ MyFrame::MyFrame()
 
     wxMenu *menuPageOperations = new wxMenu;
     menuPageOperations->Append(ID_ADD_PAGE, wxT("&Add page\tAlt-A"));
 
     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"));
     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"));


@@ -237,8 +340,13 @@ MyFrame::MyFrame()
     menuPageOperations->Append(ID_ADD_PAGE_BEFORE, wxT("Insert page &before\tAlt-B"));
     menuPageOperations->Append(ID_ADD_SUB_PAGE, wxT("Add s&ub page\tAlt-U"));
 #endif
     menuPageOperations->Append(ID_ADD_PAGE_BEFORE, wxT("Insert page &before\tAlt-B"));
     menuPageOperations->Append(ID_ADD_SUB_PAGE, wxT("Add s&ub page\tAlt-U"));
 #endif

+    menuPageOperations->AppendSeparator();
+    menuPageOperations->Append(ID_GO_HOME, wxT("Go to the first page\tCtrl-F"));

 
     wxMenu *menuOperations = new wxMenu;
 
     wxMenu *menuOperations = new wxMenu;

+#if wxUSE_HELP
+    menuOperations->Append(ID_CONTEXT_HELP, wxT("&Context help\tCtrl-F1"));
+#endif // wxUSE_HELP

     menuOperations->Append(ID_HITTEST, wxT("&Hit test\tCtrl-H"));
 
     wxMenu *menuFile = new wxMenu;
     menuOperations->Append(ID_HITTEST, wxT("&Hit test\tCtrl-H"));
 
     wxMenu *menuFile = new wxMenu;


@@ -295,7 +403,6 @@ MyFrame::MyFrame()
 
     m_panel->SetSizer(m_sizerFrame);
 
 
     m_panel->SetSizer(m_sizerFrame);
 

-    m_sizerFrame->Fit(this);

     m_sizerFrame->SetSizeHints(this);
 
     Centre(wxBOTH);
     m_sizerFrame->SetSizeHints(this);
 
     Centre(wxBOTH);


@@ -344,14 +451,14 @@ MyFrame::~MyFrame()
     #define CASE_TOOLBOOK(x)
 #endif
 
     #define CASE_TOOLBOOK(x)
 #endif
 

-#define DISPATCH_ON_TYPE(before, nb, lb, cb, tb, toolb, after)                       \
+#define DISPATCH_ON_TYPE(before, nb, lb, cb, tb, toolb, after)                \

     switch ( m_type )                                                         \
     {                                                                         \
         CASE_NOTEBOOK(before nb after)                                        \
         CASE_LISTBOOK(before lb after)                                        \
         CASE_CHOICEBOOK(before cb after)                                      \
         CASE_TREEBOOK(before tb after)                                        \
     switch ( m_type )                                                         \
     {                                                                         \
         CASE_NOTEBOOK(before nb after)                                        \
         CASE_LISTBOOK(before lb after)                                        \
         CASE_CHOICEBOOK(before cb after)                                      \
         CASE_TREEBOOK(before tb after)                                        \

-        CASE_TOOLBOOK(before toolb after)                                        \
+        CASE_TOOLBOOK(before toolb after)                                     \

                                                                               \
         default:                                                              \
             wxFAIL_MSG( _T("unknown book control type") );                    \
                                                                               \
         default:                                                              \
             wxFAIL_MSG( _T("unknown book control type") );                    \


@@ -393,7 +500,6 @@ void MyFrame::RecreateBook()
 
     if ( m_multi && m_type == Type_Notebook )
         flags |= wxNB_MULTILINE;
 
     if ( m_multi && m_type == Type_Notebook )
         flags |= wxNB_MULTILINE;

-    flags |= wxDOUBLE_BORDER;

 
     wxBookCtrlBase *oldBook = m_bookCtrl;
 
 
     wxBookCtrlBase *oldBook = m_bookCtrl;
 


@@ -472,55 +578,8 @@ void MyFrame::RecreateBook()
     m_sizerFrame->Layout();
 }
 
     m_sizerFrame->Layout();
 }
 

-BEGIN_EVENT_TABLE(MyFrame, wxFrame)
-    // File menu
-    EVT_MENU_RANGE(ID_BOOK_NOTEBOOK, ID_BOOK_MAX, MyFrame::OnType)
-    EVT_MENU_RANGE(ID_ORIENT_DEFAULT, ID_ORIENT_MAX, MyFrame::OnOrient)
-    EVT_MENU(ID_SHOW_IMAGES, MyFrame::OnShowImages)
-    EVT_MENU(ID_MULTI, MyFrame::OnMulti)
-    EVT_MENU(wxID_EXIT, MyFrame::OnExit)
-
-    // Operations menu
-    EVT_MENU(ID_ADD_PAGE, MyFrame::OnAddPage)
-    EVT_MENU(ID_INSERT_PAGE, MyFrame::OnInsertPage)
-    EVT_MENU(ID_DELETE_CUR_PAGE, MyFrame::OnDeleteCurPage)
-    EVT_MENU(ID_DELETE_LAST_PAGE, MyFrame::OnDeleteLastPage)
-    EVT_MENU(ID_NEXT_PAGE, MyFrame::OnNextPage)
-
-    EVT_MENU(ID_HITTEST, MyFrame::OnHitTest)
-
-    // Book controls
-#if wxUSE_NOTEBOOK
-    EVT_NOTEBOOK_PAGE_CHANGED(wxID_ANY, MyFrame::OnNotebook)
-    EVT_NOTEBOOK_PAGE_CHANGING(wxID_ANY, MyFrame::OnNotebook)
-#endif
-#if wxUSE_LISTBOOK
-    EVT_LISTBOOK_PAGE_CHANGED(wxID_ANY, MyFrame::OnListbook)
-    EVT_LISTBOOK_PAGE_CHANGING(wxID_ANY, MyFrame::OnListbook)
-#endif
-#if wxUSE_CHOICEBOOK
-    EVT_CHOICEBOOK_PAGE_CHANGED(wxID_ANY, MyFrame::OnChoicebook)
-    EVT_CHOICEBOOK_PAGE_CHANGING(wxID_ANY, MyFrame::OnChoicebook)
-#endif
-#if wxUSE_TREEBOOK
-    EVT_TREEBOOK_PAGE_CHANGED(wxID_ANY, MyFrame::OnTreebook)
-    EVT_TREEBOOK_PAGE_CHANGING(wxID_ANY, MyFrame::OnTreebook)
-
-    EVT_MENU(ID_ADD_SUB_PAGE, MyFrame::OnAddSubPage)
-    EVT_MENU(ID_ADD_PAGE_BEFORE, MyFrame::OnAddPageBefore)
-    EVT_UPDATE_UI_RANGE(ID_ADD_PAGE_BEFORE, ID_ADD_SUB_PAGE,
-                            MyFrame::OnUpdateTreeMenu)
-#endif
-#if wxUSE_TOOLBOOK
-    EVT_TOOLBOOK_PAGE_CHANGED(wxID_ANY, MyFrame::OnToolbook)
-    EVT_TOOLBOOK_PAGE_CHANGING(wxID_ANY, MyFrame::OnToolbook)
-#endif
-
-    // Update title in idle time
-    EVT_IDLE(MyFrame::OnIdle)
-END_EVENT_TABLE()
-
-void MyFrame::AddFlagStrIfFlagPresent(wxString & flagStr, long flags, long flag, const wxChar * flagName) const
+void MyFrame::AddFlagStrIfFlagPresent(wxString & flagStr, long flags, long flag, 
+                                      const wxChar * flagName) const

 {
     if( (flags & flag) == flag )
     {
 {
     if( (flags & flag) == flag )
     {


@@ -530,6 +589,35 @@ void MyFrame::AddFlagStrIfFlagPresent(wxString & flagStr, long flags, long flag,
     }
 }
 
     }
 }
 

+wxPanel *MyFrame::CreateNewPage() const
+{
+    wxPanel *panel = new wxPanel(m_bookCtrl, wxID_ANY );
+
+#if wxUSE_HELP
+    panel->SetHelpText( wxT( "Panel with \"First\" and \"Second\" buttons" ) );
+#endif
+
+    (void) new wxButton(panel, wxID_ANY, wxT("First button"), wxPoint(10, 30));
+    (void) new wxButton(panel, wxID_ANY, wxT("Second button"), wxPoint(150, 30));
+
+    return panel;
+}
+
+
+//-----------------------------------------------------------------------------
+// MyFrame - event handlers
+//-----------------------------------------------------------------------------
+
+#if wxUSE_HELP
+
+void MyFrame::OnContextHelp(wxCommandEvent& WXUNUSED(event))
+{
+    // launches local event loop
+    wxContextHelp ch( this );
+}
+
+#endif // wxUSE_HELP
+

 void MyFrame::OnHitTest(wxCommandEvent& WXUNUSED(event))
 {
     wxBookCtrlBase * book = GetCurrentBook();
 void MyFrame::OnHitTest(wxCommandEvent& WXUNUSED(event))
 {
     wxBookCtrlBase * book = GetCurrentBook();


@@ -540,10 +628,10 @@ void MyFrame::OnHitTest(wxCommandEvent& WXUNUSED(event))
 
     wxString flagsStr;
 
 
     wxString flagsStr;
 

-    AddFlagStrIfFlagPresent( flagsStr, flags, wxNB_HITTEST_NOWHERE, _T("wxNB_HITTEST_NOWHERE") );
-    AddFlagStrIfFlagPresent( flagsStr, flags, wxNB_HITTEST_ONICON,  _T("wxNB_HITTEST_ONICON") );
-    AddFlagStrIfFlagPresent( flagsStr, flags, wxNB_HITTEST_ONLABEL, _T("wxNB_HITTEST_ONLABEL") );
-    AddFlagStrIfFlagPresent( flagsStr, flags, wxNB_HITTEST_ONPAGE,  _T("wxNB_HITTEST_ONPAGE") );
+    AddFlagStrIfFlagPresent( flagsStr, flags, wxBK_HITTEST_NOWHERE, _T("wxBK_HITTEST_NOWHERE") );
+    AddFlagStrIfFlagPresent( flagsStr, flags, wxBK_HITTEST_ONICON,  _T("wxBK_HITTEST_ONICON") );
+    AddFlagStrIfFlagPresent( flagsStr, flags, wxBK_HITTEST_ONLABEL, _T("wxBK_HITTEST_ONLABEL") );
+    AddFlagStrIfFlagPresent( flagsStr, flags, wxBK_HITTEST_ONPAGE,  _T("wxBK_HITTEST_ONPAGE") );

 
     wxLogMessage(wxT("HitTest at (%d,%d): %d: %s"),
                  pt.x,
 
     wxLogMessage(wxT("HitTest at (%d,%d): %d: %s"),
                  pt.x,


@@ -554,7 +642,7 @@ void MyFrame::OnHitTest(wxCommandEvent& WXUNUSED(event))
 
 void MyFrame::OnType(wxCommandEvent& 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);
 
     if ( m_bookCtrl )
         m_sizerFrame->Hide(m_bookCtrl);


@@ -571,7 +659,6 @@ void MyFrame::OnUpdateTreeMenu(wxUpdateUIEvent& event)
 
 #endif // wxUSE_TREEBOOK
 
 
 #endif // wxUSE_TREEBOOK
 

-

 void MyFrame::OnOrient(wxCommandEvent& event)
 {
     m_orient = event.GetId();
 void MyFrame::OnOrient(wxCommandEvent& event)
 {
     m_orient = event.GetId();


@@ -599,17 +686,25 @@ void MyFrame::OnExit(wxCommandEvent& WXUNUSED(event))
     Close();
 }
 
     Close();
 }
 

-wxPanel *MyFrame::CreateNewPage() const
+void MyFrame::OnAddPage(wxCommandEvent& WXUNUSED(event))

 {
 {

-    wxPanel *panel = new wxPanel(m_bookCtrl, wxID_ANY );
-
-    (void) new wxButton(panel, wxID_ANY, wxT("First button"), wxPoint(10, 10));
-    (void) new wxButton(panel, wxID_ANY, wxT("Second button"), wxPoint(50, 100));
+    wxBookCtrlBase *currBook = GetCurrentBook();

 
 

-    return panel;
+    if ( currBook )
+    {
+        static unsigned s_pageAdded = 0;
+        currBook->AddPage(CreateNewPage(),
+                          wxString::Format
+                          (
+                            ADDED_PAGE_NAME wxT("%u"),
+                            ++s_pageAdded
+                          ),
+                          true,
+                          GetIconIndex(currBook));
+    }

 }
 
 }
 

-void MyFrame::OnAddPage(wxCommandEvent& WXUNUSED(event))
+void MyFrame::OnAddPageNoSelect(wxCommandEvent& WXUNUSED(event))

 {
     wxBookCtrlBase *currBook = GetCurrentBook();
 
 {
     wxBookCtrlBase *currBook = GetCurrentBook();
 


@@ -622,7 +717,7 @@ void MyFrame::OnAddPage(wxCommandEvent& WXUNUSED(event))
                             ADDED_PAGE_NAME wxT("%u"),
                             ++s_pageAdded
                           ),
                             ADDED_PAGE_NAME wxT("%u"),
                             ++s_pageAdded
                           ),

-                          true,
+                          false,

                           GetIconIndex(currBook));
     }
 }
                           GetIconIndex(currBook));
     }
 }


@@ -740,6 +835,18 @@ void MyFrame::OnNextPage(wxCommandEvent& WXUNUSED(event))
     }
 }
 
     }
 }
 

+void MyFrame::OnGoHome(wxCommandEvent& WXUNUSED(event))
+{
+    wxBookCtrlBase *currBook = GetCurrentBook();
+
+    if ( currBook )
+    {
+        // ChangeSelection shouldn't send any events, SetSelection() should
+        currBook->ChangeSelection(0);
+        //currBook->SetSelection(0);
+    }
+}
+

 void MyFrame::OnIdle( wxIdleEvent& WXUNUSED(event) )
 {
     static int s_nPages = wxNOT_FOUND;
 void MyFrame::OnIdle( wxIdleEvent& WXUNUSED(event) )
 {
     static int s_nPages = wxNOT_FOUND;


@@ -835,7 +942,7 @@ void MyFrame::OnBookCtrl(wxBookCtrlBaseEvent& event)
             // NB: can't use wxStaticCast here as wxBookCtrlBase is not in
             //     wxRTTI
             const wxBookCtrlBase * const
             // 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 )
             {
             if ( idx != wxNOT_FOUND &&
                     book && book->GetPageText(idx) == VETO_PAGE_NAME )
             {