refresh the MDI frame window menu whenever a child frame is shown/hidden (and not...

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

diff --git a/samples/notebook/notebook.cpp b/samples/notebook/notebook.cpp
index 5e0d05be50a008448f98f213712704386554376a..0931f0a56d15fa7ab35ded22d76c3e23459a3033 100644 (file)
--- a/samples/notebook/notebook.cpp
+++ b/samples/notebook/notebook.cpp
@@ -24,19 +24,23 @@
 #include "wx/artprov.h"
 #include "notebook.h"
 
 #include "wx/artprov.h"
 #include "notebook.h"
 

+#if !defined(__WXMSW__) && !defined(__WXPM__)
+    #include "../sample.xpm"
+#endif
+

 IMPLEMENT_APP(MyApp)
 
 bool MyApp::OnInit()
 {
     // Create the main window
 IMPLEMENT_APP(MyApp)
 
 bool MyApp::OnInit()
 {
     // Create the main window

-    MyFrame *frame = new MyFrame( wxT("Notebook sample") );
+    MyFrame *frame = new MyFrame();

 
     // Problem with generic wxNotebook implementation whereby it doesn't size
     // properly unless you set the size again
 #if defined(__WXMOTIF__)
     int width, height;
     frame->GetSize(& width, & height);
 
     // Problem with generic wxNotebook implementation whereby it doesn't size
     // properly unless you set the size again
 #if defined(__WXMOTIF__)
     int width, height;
     frame->GetSize(& width, & height);

-    frame->SetSize(wxDefaultPosition.x, wxDefaultPosition.y, width, height);
+    frame->SetSize(wxDefaultCoord, wxDefaultCoord, width, height);

 #endif
 
     frame->Show();
 #endif
 
     frame->Show();


@@ -44,53 +48,9 @@ bool MyApp::OnInit()
     return true;
 }
 
     return true;
 }
 

-MyNotebook::MyNotebook(wxWindow *parent, wxWindowID id,
-    const wxPoint& pos, const wxSize& size, long style)
-    : wxNotebook(parent, id, pos, size, style)
-{
-    // Empty
-}
-
-wxPanel *MyNotebook::CreatePage(const wxString&pageName)
-{
-    if
-    (
-        pageName.Contains(INSERTED_PAGE_NAME)
-        || pageName.Contains(ADDED_PAGE_NAME)
-    )
-    {
-        return CreateUserCreatedPage();
-    }
-
-    if (pageName == I_WAS_INSERTED_PAGE_NAME)
-    {
-        return CreateInsertPage();
-    }
-
-    if (pageName == VETO_PAGE_NAME)
-    {
-        return CreateVetoPage();
-    }
-
-    if (pageName == RADIOBUTTONS_PAGE_NAME)
-    {
-        return CreateRadioButtonsPage();
-    }
-
-
-    if (pageName == MAXIMIZED_BUTTON_PAGE_NAME)
-    {
-        return CreateBigButtonPage();
-    }
-
-    wxFAIL;
-
-    return (wxPanel *) NULL;
-}
-
-wxPanel *MyNotebook::CreateUserCreatedPage()
+wxPanel *CreateUserCreatedPage(wxBookCtrlBase *parent)

 {
 {

-    wxPanel *panel = new wxPanel(this);
+    wxPanel *panel = new wxPanel(parent);

 
     (void) new wxButton( panel, wxID_ANY, wxT("Button"),
         wxPoint(10, 10), wxDefaultSize );
 
     (void) new wxButton( panel, wxID_ANY, wxT("Button"),
         wxPoint(10, 10), wxDefaultSize );


@@ -98,9 +58,9 @@ wxPanel *MyNotebook::CreateUserCreatedPage()
     return panel;
 }
 
     return panel;
 }
 

-wxPanel *MyNotebook::CreateRadioButtonsPage()
+wxPanel *CreateRadioButtonsPage(wxBookCtrlBase *parent)

 {
 {

-    wxPanel *panel = new wxPanel(this);
+    wxPanel *panel = new wxPanel(parent);

 
     wxString animals[] = { wxT("Fox"), wxT("Hare"), wxT("Rabbit"),
         wxT("Sabre-toothed tiger"), wxT("T Rex") };
 
     wxString animals[] = { wxT("Fox"), wxT("Hare"), wxT("Rabbit"),
         wxT("Sabre-toothed tiger"), wxT("T Rex") };


@@ -123,9 +83,9 @@ wxPanel *MyNotebook::CreateRadioButtonsPage()
     return panel;
 }
 
     return panel;
 }
 

-wxPanel *MyNotebook::CreateVetoPage()
+wxPanel *CreateVetoPage(wxBookCtrlBase *parent)

 {
 {

-    wxPanel *panel = new wxPanel(this);
+    wxPanel *panel = new wxPanel(parent);

 
     (void) new wxStaticText( panel, wxID_ANY,
         wxT("This page intentionally left blank"), wxPoint(10, 10) );
 
     (void) new wxStaticText( panel, wxID_ANY,
         wxT("This page intentionally left blank"), wxPoint(10, 10) );


@@ -133,9 +93,9 @@ wxPanel *MyNotebook::CreateVetoPage()
     return panel;
 }
 
     return panel;
 }
 

-wxPanel *MyNotebook::CreateBigButtonPage()
+wxPanel *CreateBigButtonPage(wxBookCtrlBase *parent)

 {
 {

-    wxPanel *panel = new wxPanel(this);
+    wxPanel *panel = new wxPanel(parent);

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


@@ -147,9 +107,9 @@ wxPanel *MyNotebook::CreateBigButtonPage()
 }
 
 
 }
 
 

-wxPanel *MyNotebook::CreateInsertPage()
+wxPanel *CreateInsertPage(wxBookCtrlBase *parent)

 {
 {

-    wxPanel *panel = new wxPanel(this);
+    wxPanel *panel = new wxPanel(parent);

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


@@ -158,160 +118,171 @@ wxPanel *MyNotebook::CreateInsertPage()
     return panel;
 }
 
     return panel;
 }
 

-void MyNotebook::CreateInitialPages()
-{
-    // Create and add some panels to the notebook
-
-    wxPanel *panel = CreateRadioButtonsPage();
-    AddPage( panel, RADIOBUTTONS_PAGE_NAME, false, GetIconIndex() );
-
-    panel = CreateVetoPage();
-    AddPage( panel, VETO_PAGE_NAME, false, GetIconIndex() );
-
-    panel = CreateBigButtonPage();
-    AddPage( panel, MAXIMIZED_BUTTON_PAGE_NAME, false, GetIconIndex() );
-
-    panel = CreateInsertPage();
-    InsertPage( 0, panel, I_WAS_INSERTED_PAGE_NAME, false, GetIconIndex() );
-
-
-    SetSelection(1);
-}
-
-int MyNotebook::GetIconIndex() const
+int GetIconIndex(wxBookCtrlBase* bookCtrl)

 {
 {

-    if (m_imageList)
+    if (bookCtrl && bookCtrl->GetImageList())

     {
     {

-       int nImages = m_imageList->GetImageCount();
+       int nImages = bookCtrl->GetImageList()->GetImageCount();

        if (nImages > 0)
        {
        if (nImages > 0)
        {

-           return GetPageCount() % nImages;
+           return bookCtrl->GetPageCount() % nImages;

        }
     }
 
     return -1;
 }
 
        }
     }
 
     return -1;
 }
 

-MyFrame::MyFrame(const wxString& title, const wxPoint& pos, const wxSize& size,
-                 long style)
-    : wxFrame((wxWindow *) NULL, wxID_ANY, title, pos, size, style)
+void CreateInitialPages(wxBookCtrlBase *parent)

 {
 {

-    m_panel = (wxPanel *) NULL;
-    m_notebook = (MyNotebook *) NULL;
+    // Create and add some panels to the notebook

 
 

-    // create a dummy image list with a few icons
-    wxSize imageSize(32, 32);
+    wxPanel *panel = CreateRadioButtonsPage(parent);
+    parent->AddPage( panel, RADIOBUTTONS_PAGE_NAME, false, GetIconIndex(parent) );

 
 

-    m_imageList
-        = new wxImageList( imageSize.GetWidth(), imageSize.GetHeight() );
+    panel = CreateVetoPage(parent);
+    parent->AddPage( panel, VETO_PAGE_NAME, false, GetIconIndex(parent) );

 
 

-    m_imageList->Add
-        (
-            wxArtProvider::GetIcon(wxART_INFORMATION, wxART_OTHER, imageSize)
-        );
+    panel = CreateBigButtonPage(parent);
+    parent->AddPage( panel, MAXIMIZED_BUTTON_PAGE_NAME, false, GetIconIndex(parent) );

 
 

-    m_imageList->Add
-        (
-            wxArtProvider::GetIcon(wxART_QUESTION, wxART_OTHER, imageSize)
-        );
+    panel = CreateInsertPage(parent);
+    parent->InsertPage( 0, panel, I_WAS_INSERTED_PAGE_NAME, false, GetIconIndex(parent) );

 
 

-    m_imageList->Add
-        (
-            wxArtProvider::GetIcon(wxART_WARNING, wxART_OTHER, imageSize)
-        );
+    parent->SetSelection(1);
+}

 
 

-    m_imageList->Add
-        (
-            wxArtProvider::GetIcon(wxART_ERROR, wxART_OTHER, imageSize)
-        );
+wxPanel *CreatePage(wxBookCtrlBase *parent, const wxString&pageName)
+{
+    if ( pageName.Contains(INSERTED_PAGE_NAME) ||
+            pageName.Contains(ADDED_PAGE_NAME) ||
+                pageName.Contains(ADDED_SUB_PAGE_NAME) ||
+                    pageName.Contains(ADDED_PAGE_NAME_BEFORE) )
+        return CreateUserCreatedPage(parent);

 
 

-    m_panel = new wxPanel(this, wxID_ANY, wxDefaultPosition, wxDefaultSize,
-        wxTAB_TRAVERSAL | wxCLIP_CHILDREN | wxNO_BORDER | wxNO_FULL_REPAINT_ON_RESIZE);
+    if ( pageName == I_WAS_INSERTED_PAGE_NAME )
+        return CreateInsertPage(parent);

 
 

-    // Create remaining controls
+    if ( pageName == VETO_PAGE_NAME )
+        return CreateVetoPage(parent);

 
 

-    // must be in sync with Orient enum
-    wxString strOrientations[] =
-    {
-        wxT("&Top"),
-        wxT("&Bottom"),
-        wxT("&Left"),
-        wxT("&Right"),
-    };
+    if ( pageName == RADIOBUTTONS_PAGE_NAME )
+        return CreateRadioButtonsPage(parent);

 
 

-    wxASSERT_MSG( WXSIZEOF(strOrientations) == ORIENT_MAX,
-                  wxT("Forgot to update something") );
+    if ( pageName == MAXIMIZED_BUTTON_PAGE_NAME )
+        return CreateBigButtonPage(parent);
+
+    wxFAIL_MSG( _T("unknown page name") );
+
+    return NULL;
+}
+
+MyFrame::MyFrame()
+       : wxFrame(NULL, wxID_ANY,  wxString(wxT("wxWidgets book controls sample")))
+{
+#if wxUSE_NOTEBOOK
+    m_type = Type_Notebook;
+#elif wxUSE_CHOICEBOOK
+    m_type = Type_Choicebook;
+#elif wxUSE_LISTBOOK
+    m_type = Type_Listbook;
+#elif wxUSE_TREEBOOK
+    m_type = Type_Treebook;
+#elif
+    #error "Don't use Notebook sample without any book enabled in wxWidgets build!"
+#endif

 
 

-    m_radioOrient = new wxRadioBox
-                    (
-                        m_panel, ID_RADIO_ORIENT,
-                        wxT("&Tab orientation"),
-                        wxDefaultPosition, wxDefaultSize,
-                        WXSIZEOF(strOrientations), strOrientations,
-                        1, wxRA_SPECIFY_COLS
-                    );
+    m_orient = ID_ORIENT_DEFAULT;
+    m_chkShowImages = true;
+    m_multi = false;

 
 

-    m_chkShowImages = new wxCheckBox( m_panel, ID_CHK_SHOWIMAGES,
-        wxT("&Show images") );
-#ifndef TEST_LISTBOOK
-    m_chkMultiLine = new wxCheckBox( m_panel, ID_CHK_MULTILINE,
-        wxT("&Multiple lines") );
-#endif // !TEST_LISTBOOK
+    SetIcon(wxICON(sample));

 
 

-    m_btnAddPage = new wxButton( m_panel, ID_BTN_ADD_PAGE, wxT("&Add page") );
+    // menu of the sample
+    wxMenu *menuType = new wxMenu;
+#if wxUSE_NOTEBOOK
+    menuType->AppendRadioItem(ID_BOOK_NOTEBOOK,   wxT("&Notebook\tCtrl-1"));
+#endif
+#if wxUSE_LISTBOOK
+    menuType->AppendRadioItem(ID_BOOK_LISTBOOK,   wxT("&Listbook\tCtrl-2"));
+#endif
+#if wxUSE_CHOICEBOOK
+    menuType->AppendRadioItem(ID_BOOK_CHOICEBOOK, wxT("&Choicebook\tCtrl-3"));
+#endif
+#if wxUSE_TREEBOOK
+    menuType->AppendRadioItem(ID_BOOK_TREEBOOK,   wxT("&Treebook\tCtrl-4"));
+#endif

 
 

-    m_btnInsertPage = new wxButton( m_panel, ID_BTN_INSERT_PAGE,
-        wxT("&Insert page") );
+    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"));
+
+    wxMenu *menuOperations = new wxMenu;
+    menuOperations->Append(ID_ADD_PAGE, wxT("&Add page\tAlt-A"));
+    menuOperations->Append(ID_INSERT_PAGE, wxT("&Insert page\tAlt-I"));
+    menuOperations->Append(ID_DELETE_CUR_PAGE, wxT("&Delete current page\tAlt-D"));
+    menuOperations->Append(ID_DELETE_LAST_PAGE, wxT("D&elete last page\tAlt-L"));
+    menuOperations->Append(ID_NEXT_PAGE, wxT("&Next page\tAlt-N"));
+#if wxUSE_TREEBOOK
+    menuOperations->AppendSeparator();
+    menuOperations->Append(ID_ADD_PAGE_BEFORE, wxT("Insert page &before\tAlt-B"));
+    menuOperations->Append(ID_ADD_SUB_PAGE, wxT("Add s&ub page\tAlt-U"));
+#endif

 
 

-    m_btnDeleteCurPage = new wxButton( m_panel, ID_BTN_DELETE_CUR_PAGE,
-        wxT("&Delete current page") );
+    wxMenu *menuFile = new wxMenu;
+    menuFile->Append(wxID_ANY, wxT("&Type"), menuType, wxT("Type of control"));
+    menuFile->Append(wxID_ANY, wxT("&Orientation"), menuOrient, wxT("Orientation of control"));
+    menuFile->AppendCheckItem(ID_SHOW_IMAGES, wxT("&Show images\tAlt-S"));
+    menuFile->AppendCheckItem(ID_MULTI, wxT("&Multiple lines\tAlt-M"));
+    menuFile->AppendSeparator();
+    menuFile->Append(wxID_EXIT, wxT("E&xit"), wxT("Quits the application"));
+    menuFile->Check(ID_SHOW_IMAGES, m_chkShowImages);
+    menuFile->Check(ID_MULTI, m_multi);
+
+    wxMenuBar *menuBar = new wxMenuBar;
+    menuBar->Append(menuFile, wxT("&File"));
+    menuBar->Append(menuOperations, wxT("&Operations"));
+    SetMenuBar(menuBar);
+
+    // books creation
+    m_panel    = NULL;
+    m_bookCtrl = NULL;

 
 

-    m_btnDeleteLastPage = new wxButton( m_panel, ID_BTN_DELETE_LAST_PAGE,
-        wxT("Delete las&t page") );
+    // create a dummy image list with a few icons
+    const wxSize imageSize(32, 32);

 
 

-    m_btnNextPage = new wxButton( m_panel, ID_BTN_NEXT_PAGE,
-        wxT("&Next page") );
+    m_imageList = new wxImageList(imageSize.GetWidth(), imageSize.GetHeight());
+    m_imageList->
+        Add(wxArtProvider::GetIcon(wxART_INFORMATION, wxART_OTHER, imageSize));
+    m_imageList->
+        Add(wxArtProvider::GetIcon(wxART_QUESTION, wxART_OTHER, imageSize));
+    m_imageList->
+        Add(wxArtProvider::GetIcon(wxART_WARNING, wxART_OTHER, imageSize));
+    m_imageList->
+        Add(wxArtProvider::GetIcon(wxART_ERROR, wxART_OTHER, imageSize));

 
 

-    m_btnExit = new wxButton( m_panel, wxID_OK, wxT("&Exit") );
-    m_btnExit->SetDefault();
+    m_panel = new wxPanel(this);

 
 

+#if USE_LOG

     m_text = new wxTextCtrl(m_panel, wxID_ANY, wxEmptyString,
     m_text = new wxTextCtrl(m_panel, wxID_ANY, wxEmptyString,

-        wxDefaultPosition, wxDefaultSize, wxTE_MULTILINE | wxTE_READONLY);
+                            wxDefaultPosition, wxDefaultSize,
+                            wxTE_MULTILINE | wxTE_READONLY);

 
     m_logTargetOld = wxLog::SetActiveTarget( new wxLogTextCtrl(m_text) );
 
     m_logTargetOld = wxLog::SetActiveTarget( new wxLogTextCtrl(m_text) );

+#endif // USE_LOG

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

-    m_sizerTop = new wxBoxSizer(wxHORIZONTAL);
-
-    wxBoxSizer *sizerLeft = new wxBoxSizer(wxVERTICAL);
-    sizerLeft->Add(m_radioOrient, 0, wxEXPAND);
-    sizerLeft->Add(m_chkShowImages, 0, wxEXPAND | wxTOP, 4);
-#ifndef TEST_LISTBOOK
-    sizerLeft->Add(m_chkMultiLine, 0, wxEXPAND | wxTOP, 4);
-#endif // !TEST_LISTBOOK
-
-    sizerLeft->Add(0, 0, 1); // Spacer
-
-    sizerLeft->Add(m_btnAddPage, 0, wxEXPAND | (wxTOP | wxBOTTOM), 4);
-    sizerLeft->Add(m_btnInsertPage, 0, wxEXPAND | (wxTOP | wxBOTTOM), 4);
-    sizerLeft->Add(m_btnDeleteCurPage, 0, wxEXPAND | (wxTOP | wxBOTTOM), 4);
-    sizerLeft->Add(m_btnDeleteLastPage, 0, wxEXPAND | (wxTOP | wxBOTTOM), 4);
-    sizerLeft->Add(m_btnNextPage, 0, wxEXPAND | (wxTOP | wxBOTTOM), 4);
-
-    sizerLeft->Add(0, 0, 1); // Spacer
-
-    sizerLeft->Add(m_btnExit, 0, wxEXPAND);
+#if USE_LOG
+    m_sizerFrame->Add(m_text, 1, wxEXPAND);
+#endif // USE_LOG

 
 

-    m_sizerTop->Add(sizerLeft, 0, wxEXPAND | wxALL, 4);
-
-
-    m_sizerFrame->Add(m_sizerTop, 1, wxEXPAND);
-    m_sizerFrame->Add(m_text, 0, wxEXPAND);
-
-    ReInitNotebook();
-    m_notebook->CreateInitialPages();
+    RecreateBook();

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


@@ -319,247 +290,526 @@ MyFrame::MyFrame(const wxString& title, const wxPoint& pos, const wxSize& size,
     m_sizerFrame->SetSizeHints(this);
 
     Centre(wxBOTH);
     m_sizerFrame->SetSizeHints(this);
 
     Centre(wxBOTH);

-

 }
 
 MyFrame::~MyFrame()
 {
 }
 
 MyFrame::~MyFrame()
 {

+#if USE_LOG

     delete wxLog::SetActiveTarget(m_logTargetOld);
     delete wxLog::SetActiveTarget(m_logTargetOld);

+#endif // USE_LOG

 
 

-    if (m_imageList)
-    {
-        delete m_imageList;
-        m_imageList = (wxImageList *) NULL;
+    delete m_imageList;
+}
+
+// DISPATCH_ON_TYPE() macro is an ugly way to write the "same" code for
+// different wxBookCtrlBase-derived classes without duplicating code and
+// without using templates, it expands into "before <xxx> after" where "xxx"
+// part is control class-specific
+#if wxUSE_NOTEBOOK
+    #define CASE_NOTEBOOK(x) case Type_Notebook: x; break;
+#else
+    #define CASE_NOTEBOOK(x)
+#endif
+
+#if wxUSE_LISTBOOK
+    #define CASE_LISTBOOK(x) case Type_Listbook: x; break;
+#else
+    #define CASE_LISTBOOK(x)
+#endif
+
+#if wxUSE_CHOICEBOOK
+    #define CASE_CHOICEBOOK(x) case Type_Choicebook: x; break;
+#else
+    #define CASE_CHOICEBOOK(x)
+#endif
+
+#if wxUSE_TREEBOOK
+    #define CASE_TREEBOOK(x) case Type_Treebook: x; break;
+#else
+    #define CASE_TREEBOOK(x)
+#endif
+
+#define DISPATCH_ON_TYPE(before, nb, lb, cb, 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)                                        \
+                                                                              \
+        default:                                                              \
+            wxFAIL_MSG( _T("unknown book control type") );                    \

     }
 
     }
 

+int MyFrame::TranslateBookFlag(int nb, int lb, int chb, int tbk) const
+{
+    int flag = 0;
+
+    DISPATCH_ON_TYPE(flag =, nb,  lb,  chb,  tbk, + 0);
+
+    return flag;

 }
 
 }
 

-void MyFrame::ReInitNotebook()
+void MyFrame::RecreateBook()

 {
     int flags;
 {
     int flags;

-
-    switch ( m_radioOrient->GetSelection() )
+    switch ( m_orient )

     {
     {

-        default:
-            wxFAIL_MSG( wxT("unknown notebook orientation") );
-            // fall through
-
-        case ORIENT_TOP:
-            flags = wxNB_TOP;
+        case ID_ORIENT_TOP:
+            flags = wxBK_TOP;

             break;
 
             break;
 

-        case ORIENT_BOTTOM:
-            flags = wxNB_BOTTOM;
+        case ID_ORIENT_BOTTOM:
+            flags = wxBK_BOTTOM;

             break;
 
             break;
 

-        case ORIENT_LEFT:
-            flags = wxNB_LEFT;
+        case ID_ORIENT_LEFT:
+            flags = wxBK_LEFT;

             break;
 
             break;
 

-        case ORIENT_RIGHT:
-            flags = wxNB_RIGHT;
+        case ID_ORIENT_RIGHT:
+            flags = wxBK_RIGHT;

             break;
             break;

+
+        default:
+            flags = wxBK_DEFAULT;

     }
 
     }
 

-#ifndef TEST_LISTBOOK
-    if ( m_chkMultiLine->IsChecked() )
+    if ( m_multi && m_type == Type_Notebook )

         flags |= wxNB_MULTILINE;
         flags |= wxNB_MULTILINE;

-#endif // !TEST_LISTBOOK
+    flags |= wxDOUBLE_BORDER;

 
 

-    MyNotebook *notebook = m_notebook;
+    wxBookCtrlBase *oldBook = m_bookCtrl;

 
 

-    m_notebook = new MyNotebook(m_panel, ID_NOTEBOOK,
-                                wxDefaultPosition, wxDefaultSize,
-                                flags);
+    m_bookCtrl = NULL;

 
 

-    if ( m_chkShowImages->IsChecked() )
+    DISPATCH_ON_TYPE(m_bookCtrl = new,
+                         wxNotebook,
+                         wxListbook,
+                         wxChoicebook,
+                         wxTreebook,
+                     (m_panel, wxID_ANY, wxDefaultPosition, wxDefaultSize, flags));
+
+    if ( !m_bookCtrl )
+        return;
+
+    m_bookCtrl->Hide();
+
+    if ( m_chkShowImages )

     {
     {

-        m_notebook->SetImageList(m_imageList);
+        m_bookCtrl->SetImageList(m_imageList);

     }
 
     }
 

-    if (notebook)
+    if ( oldBook )

     {
     {

-        int sel = notebook->GetSelection();
-
-        int count = notebook->GetPageCount();
-        for (int n = 0; n < count; n++)
+#if wxUSE_TREEBOOK
+        // we only need the old treebook if we're recreating another treebook
+        wxTreebook *tbkOld = m_type == Type_Treebook
+                                ? wxDynamicCast(oldBook, wxTreebook)
+                                : NULL;
+#endif // wxUSE_TREEBOOK
+
+        const int count = oldBook->GetPageCount();
+        for ( int n = 0; n < count; n++ )

         {
         {

-            wxString str = notebook->GetPageText(n);
+            const int image = GetIconIndex(m_bookCtrl);
+            const wxString str = oldBook->GetPageText(n);

 
 

-            wxWindow *page = m_notebook->CreatePage(str);
-            m_notebook->AddPage(page, str, false, m_notebook->GetIconIndex() );
-        }
+            wxWindow *page = CreatePage(m_bookCtrl, str);

 
 

-        m_sizerTop->Remove(notebook);
-        
-        delete notebook;
+            // treebook complication: need to account for possible parent page
+#if wxUSE_TREEBOOK
+            if ( tbkOld )
+            {
+                const int parent = tbkOld->GetPageParent(n);
+                if ( parent != wxNOT_FOUND )
+                {
+                    wxStaticCast(m_bookCtrl, wxTreebook)->
+                        AddSubPage(parent, page, str, false, image);
+
+                    // skip adding it again below
+                    continue;
+                }
+            }
+#endif // wxUSE_TREEBOOK

 
 

-        // restore selection
-        if (sel != -1)
-        {
-            m_notebook->SetSelection(sel);
+            m_bookCtrl->AddPage(page, str, false, image);

         }
 
         }
 

+        const int sel = oldBook->GetSelection();
+        if ( sel != wxNOT_FOUND )
+            m_bookCtrl->SetSelection(sel);
+
+
+        m_sizerFrame->Detach(oldBook);
+        delete oldBook;
+    }
+    else // no old book
+    {
+        CreateInitialPages(m_bookCtrl);

     }
 
     }
 

+    m_sizerFrame->Insert(0, m_bookCtrl, wxSizerFlags(5).Expand().Border());

 
 

-    m_sizerTop->Add(m_notebook, 1, wxEXPAND | wxALL, 4);
-    m_sizerTop->Layout();
+    m_sizerFrame->Show(m_bookCtrl);
+    m_sizerFrame->Layout();

 }
 
 BEGIN_EVENT_TABLE(MyFrame, wxFrame)
 }
 
 BEGIN_EVENT_TABLE(MyFrame, wxFrame)

-    EVT_RADIOBOX(ID_RADIO_ORIENT, MyFrame::OnCheckOrRadioBox)
-    EVT_CHECKBOX(ID_CHK_SHOWIMAGES, MyFrame::OnCheckOrRadioBox)
-#ifndef TEST_LISTBOOK
-    EVT_CHECKBOX(ID_CHK_MULTILINE, MyFrame::OnCheckOrRadioBox)
-#endif // !TEST_LISTBOOK
-
-    EVT_BUTTON(ID_BTN_ADD_PAGE, MyFrame::OnButtonAddPage)
-    EVT_BUTTON(ID_BTN_INSERT_PAGE, MyFrame::OnButtonInsertPage)
-    EVT_BUTTON(ID_BTN_DELETE_CUR_PAGE, MyFrame::OnButtonDeleteCurPage)
-    EVT_BUTTON(ID_BTN_DELETE_LAST_PAGE, MyFrame::OnButtonDeleteLastPage)
-    EVT_BUTTON(ID_BTN_NEXT_PAGE, MyFrame::OnButtonNextPage)
-    EVT_BUTTON(wxID_OK, MyFrame::OnButtonExit)
-
-    EVT_UPDATE_UI(ID_BTN_DELETE_CUR_PAGE, MyFrame::OnUpdateUIBtnDeleteCurPage)
-    EVT_UPDATE_UI(ID_BTN_DELETE_LAST_PAGE, MyFrame::OnUpdateUIBtnDeleteLastPage)
-
-    EVT_NOTEBOOK_PAGE_CHANGED(ID_NOTEBOOK, MyFrame::OnNotebook)
-    EVT_NOTEBOOK_PAGE_CHANGING(ID_NOTEBOOK, MyFrame::OnNotebook)
+    // 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)
+
+    // 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

 
 

+    // Update title in idle time

     EVT_IDLE(MyFrame::OnIdle)
 END_EVENT_TABLE()
 
     EVT_IDLE(MyFrame::OnIdle)
 END_EVENT_TABLE()
 

-void MyFrame::OnCheckOrRadioBox(wxCommandEvent& WXUNUSED(event))
+void MyFrame::OnType(wxCommandEvent& event)

 {
 {

-    ReInitNotebook();
+    m_type = wx_static_cast(BookType, event.GetId() - ID_BOOK_NOTEBOOK);
+
+    if ( m_bookCtrl )
+        m_sizerFrame->Hide(m_bookCtrl);
+
+    RecreateBook();

 }
 
 }
 

-void MyFrame::OnButtonAddPage( wxCommandEvent& WXUNUSED(event) )
+#if wxUSE_TREEBOOK
+
+void MyFrame::OnUpdateTreeMenu(wxUpdateUIEvent& event)

 {
 {

-    static unsigned s_pageAdded = 0;
+    event.Enable(m_type == Type_Treebook);
+}

 
 

-    wxPanel *panel = new wxPanel( m_notebook, wxID_ANY );
-    (void) new wxButton( panel, wxID_ANY, wxT("First button"),
-        wxPoint(10, 10), wxDefaultSize );
-    (void) new wxButton( panel, wxID_ANY, wxT("Second button"),
-        wxPoint(50, 100), wxDefaultSize );
+#endif // wxUSE_TREEBOOK

 
 

-    m_notebook->AddPage(panel, wxString::Format(ADDED_PAGE_NAME wxT("%u"),
-        ++s_pageAdded), true, m_notebook->GetIconIndex() );
-}

 
 

-void MyFrame::OnButtonInsertPage( wxCommandEvent& WXUNUSED(event) )
+void MyFrame::OnOrient(wxCommandEvent& event)

 {
 {

-    static unsigned s_pageIns = 0;
+    m_orient = event.GetId();
+    RecreateBook();
+    m_sizerFrame->Layout();
+}

 
 

-    wxPanel *panel = m_notebook->CreateUserCreatedPage();
+void MyFrame::OnShowImages(wxCommandEvent& event)
+{
+    m_chkShowImages = event.IsChecked();
+    RecreateBook();
+    m_sizerFrame->Layout();
+}

 
 

-    m_notebook->InsertPage( 0, panel,
-        wxString::Format(INSERTED_PAGE_NAME wxT("%u"), ++s_pageIns), false,
-        m_notebook->GetIconIndex() );
+void MyFrame::OnMulti(wxCommandEvent& event)
+{
+    m_multi = event.IsChecked();
+    RecreateBook();
+    m_sizerFrame->Layout();
+    wxLogMessage(_T("Multiline setting works only in wxNotebook."));
+}

 
 

-    m_notebook->SetSelection(0);
+void MyFrame::OnExit(wxCommandEvent& WXUNUSED(event))
+{
+    Close();

 }
 
 }
 

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

 {
 {

-    int page = m_notebook->GetPageCount();
+    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));

 
 

-    if ( page != 0 )
-    {
-        m_notebook->DeletePage(page - 1);
-    }
+    return panel;

 }
 
 }
 

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

 {
 {

-    int sel = m_notebook->GetSelection();
+    wxBookCtrlBase *currBook = GetCurrentBook();

 
 

-    if (sel != -1)
+    if ( currBook )

     {
     {

-        m_notebook->DeletePage(sel);
+        static unsigned s_pageAdded = 0;
+        currBook->AddPage(CreateNewPage(),
+                          wxString::Format
+                          (
+                            ADDED_PAGE_NAME wxT("%u"),
+                            ++s_pageAdded
+                          ),
+                          true,
+                          GetIconIndex(currBook));

     }
 }
 
     }
 }
 

-void MyFrame::OnButtonNextPage( wxCommandEvent& WXUNUSED(event) )
+#if wxUSE_TREEBOOK
+void MyFrame::OnAddSubPage(wxCommandEvent& WXUNUSED(event))

 {
 {

-    m_notebook->AdvanceSelection();
+    wxTreebook *currBook = wxDynamicCast(GetCurrentBook(), wxTreebook);
+    if ( currBook )
+    {
+        const int selPos = currBook->GetSelection();
+        if ( selPos == wxNOT_FOUND )
+        {
+            wxLogError(_T("Select the parent page first!"));
+            return;
+        }
+
+        static unsigned s_subPageAdded = 0;
+        currBook->AddSubPage(selPos,
+                             CreateNewPage(),
+                             wxString::Format
+                             (
+                                ADDED_SUB_PAGE_NAME wxT("%u"),
+                                ++s_subPageAdded
+                             ),
+                             true,
+                             GetIconIndex(currBook));
+    }

 }
 
 }
 

-void MyFrame::OnButtonExit( wxCommandEvent& WXUNUSED(event) )
+void MyFrame::OnAddPageBefore(wxCommandEvent& WXUNUSED(event))

 {
 {

-    Close();
+    wxBookCtrlBase *currBook = GetCurrentBook();
+    if ( currBook )
+    {
+        const int selPos = currBook->GetSelection();
+        if ( selPos == wxNOT_FOUND )
+        {
+            wxLogError(_T("Select the parent page first!"));
+            return;
+        }
+
+        static unsigned s_subPageAdded = 0;
+        currBook->InsertPage(selPos,
+                             CreateNewPage(),
+                             wxString::Format
+                             (
+                                ADDED_PAGE_NAME_BEFORE wxT("%u"),
+                                ++s_subPageAdded
+                             ),
+                             true,
+                             GetIconIndex(currBook));
+    }

 }
 }

+#endif // wxUSE_TREEBOOK

 
 

-void MyFrame::OnNotebook(wxNotebookEvent& event)
+void MyFrame::OnInsertPage(wxCommandEvent& WXUNUSED(event))

 {
 {

-    wxString str = wxT("Unknown notebook event");
+    static unsigned s_pageIns = 0;

 
 

-    wxEventType eventType = event.GetEventType();
+    wxBookCtrlBase *currBook = GetCurrentBook();

 
 

-    if (eventType == wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGED)
+    if ( currBook )

     {
     {

-        str = wxT("Notebook changed");
+        wxPanel *panel = CreateUserCreatedPage( currBook );
+
+        currBook->InsertPage( 0, panel,
+            wxString::Format(INSERTED_PAGE_NAME wxT("%u"), ++s_pageIns), false,
+            GetIconIndex(currBook) );
+
+        currBook->SetSelection(0);

     }
     }

-    else if (eventType == wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGING)
-    {
-        int idx = event.GetOldSelection();
-        if ( idx != -1 && m_notebook->GetPageText(idx) == VETO_PAGE_NAME )
-        {
-            if
-            (
-                wxMessageBox(
-                wxT("Are you sure you want to leave this notebook page?\n")
-                wxT("(This demonstrates veto-ing)"),
-                          wxT("Notebook sample"),
-                          wxICON_QUESTION | wxYES_NO, this) != wxYES )
-            {
-                event.Veto();
+}

 
 

-                return;
-            }
+void MyFrame::OnDeleteCurPage(wxCommandEvent& WXUNUSED(event))
+{
+    wxBookCtrlBase *currBook = GetCurrentBook();

 
 

-        }
+    if ( currBook )
+    {
+        int sel = currBook->GetSelection();

 
 

-        str = wxT("Notebook changing");
+        if (sel != wxNOT_FOUND)
+        {
+            currBook->DeletePage(sel);
+        }

     }
     }

+}

 
 

-    static int s_numNotebookEvents = 0;
+void MyFrame::OnDeleteLastPage(wxCommandEvent& WXUNUSED(event))
+{
+    wxBookCtrlBase *currBook = GetCurrentBook();

 
 

-    wxLogMessage(wxT("Notebook event #%d: %s (%d)"),
-        s_numNotebookEvents++, str.c_str(), eventType);
+    if ( currBook )
+    {
+        int page = currBook->GetPageCount();

 
 

-    m_text->SetInsertionPointEnd();
+        if ( page != 0 )
+        {
+            currBook->DeletePage(page - 1);
+        }
+    }
+}

 
 

-    event.Skip();
+void MyFrame::OnNextPage(wxCommandEvent& WXUNUSED(event))
+{
+    wxBookCtrlBase *currBook = GetCurrentBook();
+
+    if ( currBook )
+    {
+        currBook->AdvanceSelection();
+    }

 }
 
 void MyFrame::OnIdle( wxIdleEvent& WXUNUSED(event) )
 {
 }
 
 void MyFrame::OnIdle( wxIdleEvent& WXUNUSED(event) )
 {

-    static int s_nPages = -1;
-    static int s_nSel = -1;
+    static int s_nPages = wxNOT_FOUND;
+    static int s_nSel = wxNOT_FOUND;
+    static wxBookCtrlBase *s_currBook = NULL;

 
 

-    int nPages = m_notebook->GetPageCount();
-    int nSel = m_notebook->GetSelection();
-    if ( nPages != s_nPages || nSel != s_nSel )
+    wxBookCtrlBase *currBook = GetCurrentBook();
+
+    int nPages = currBook ? currBook->GetPageCount() : 0;
+    int nSel = currBook ? currBook->GetSelection() : wxNOT_FOUND;
+
+    if ( nPages != s_nPages || nSel != s_nSel || s_currBook != currBook )

     {
         s_nPages = nPages;
         s_nSel = nSel;
     {
         s_nPages = nPages;
         s_nSel = nSel;

+        s_currBook = currBook;
+
+        wxString selection;
+        if ( nSel == wxNOT_FOUND )
+            selection << wxT("not found");
+        else
+            selection << nSel;

 
         wxString title;
 
         wxString title;

-        title.Printf(wxT("Notebook (%d pages, selection: %d)"), nPages, nSel);
+        title.Printf(wxT("Notebook and friends (%d pages, selection: %s)"), nPages, selection.c_str());

 
         SetTitle(title);
     }
 }
 
 
         SetTitle(title);
     }
 }
 

-void MyFrame::OnUpdateUIBtnDeleteCurPage(wxUpdateUIEvent& event)
+void MyFrame::OnBookCtrl(wxBookCtrlBaseEvent& event)

 {
 {

-    event.Enable( m_notebook->GetSelection() != -1 );
-}
+    static const struct EventInfo
+    {
+        wxEventType typeChanged,
+                    typeChanging;
+        const wxChar *name;
+    } events[] =
+    {
+#if wxUSE_NOTEBOOK
+        {
+            wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGED,
+            wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGING,
+            _T("wxNotebook")
+        },
+#endif // wxUSE_NOTEBOOK
+#if wxUSE_LISTBOOK
+        {
+            wxEVT_COMMAND_LISTBOOK_PAGE_CHANGED,
+            wxEVT_COMMAND_LISTBOOK_PAGE_CHANGING,
+            _T("wxListbook")
+        },
+#endif // wxUSE_LISTBOOK
+#if wxUSE_CHOICEBOOK
+        {
+            wxEVT_COMMAND_CHOICEBOOK_PAGE_CHANGED,
+            wxEVT_COMMAND_CHOICEBOOK_PAGE_CHANGING,
+            _T("wxChoicebook")
+        },
+#endif // wxUSE_CHOICEBOOK
+#if wxUSE_TREEBOOK
+        {
+            wxEVT_COMMAND_TREEBOOK_PAGE_CHANGED,
+            wxEVT_COMMAND_TREEBOOK_PAGE_CHANGING,
+            _T("wxTreebook")
+        },
+#endif // wxUSE_TREEBOOK
+    };

 
 

-void MyFrame::OnUpdateUIBtnDeleteLastPage(wxUpdateUIEvent& event)
-{
-    event.Enable( m_notebook->GetPageCount() != 0 );
+
+    wxString nameEvent,
+             nameControl,
+             veto;
+    const wxEventType eventType = event.GetEventType();
+    for ( size_t n = 0; n < WXSIZEOF(events); n++ )
+    {
+        const EventInfo& ei = events[n];
+        if ( eventType == ei.typeChanged )
+        {
+            nameEvent = wxT("Changed");
+        }
+        else if ( eventType == ei.typeChanging )
+        {
+            const int idx = event.GetOldSelection();
+
+            // NB: can't use wxStaticCast here as wxBookCtrlBase is not in
+            //     wxRTTI
+            const wxBookCtrlBase * const
+                book = wx_static_cast(wxBookCtrlBase *, event.GetEventObject());
+            if ( idx != wxNOT_FOUND &&
+                    book && book->GetPageText(idx) == VETO_PAGE_NAME )
+            {
+                if ( wxMessageBox
+                     (
+                      wxT("Are you sure you want to leave this page?\n")
+                      wxT("(This demonstrates veto-ing)"),
+                      wxT("Notebook sample"),
+                      wxICON_QUESTION | wxYES_NO,
+                      this
+                     ) != wxYES )
+                {
+                    event.Veto();
+                    veto = _T(" (vetoed)");
+                }
+            }
+
+            nameEvent = wxT("Changing");
+        }
+        else // skip end of the loop
+        {
+            continue;
+        }
+
+        nameControl = ei.name;
+        break;
+    }
+
+    static int s_num = 0;
+
+    wxLogMessage(wxT("Event #%d: %s: %s (%d) new sel %d, old %d%s"),
+                 ++s_num,
+                 nameControl.c_str(),
+                 nameEvent.c_str(),
+                 eventType,
+                 event.GetSelection(),
+                 event.GetOldSelection(),
+                 veto.c_str());
+
+#if USE_LOG
+    m_text->SetInsertionPointEnd();
+#endif

 }
 }