Resolve ambiguity between GetClientXXX() methods in wxOSX wxComboBox.

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

diff --git a/samples/notebook/notebook.cpp b/samples/notebook/notebook.cpp
index c9e3cb44cab351f47f2f846033cb7b501d7dc4c8..3aceabbe2fc94d2af6a3e79edbc3f5601174838e 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
 // 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".
 /////////////////////////////////////////////////////////////////////////////
 
 // For compilers that support precompilation, includes "wx.h".


@@ -22,16 +22,29 @@
 
 #include "wx/imaglist.h"
 #include "wx/artprov.h"
 
 #include "wx/imaglist.h"
 #include "wx/artprov.h"

+#include "wx/cshelp.h"
+#include "wx/utils.h"

 #include "notebook.h"
 
 #if !defined(__WXMSW__) && !defined(__WXPM__)
     #include "../sample.xpm"
 #endif
 
 #include "notebook.h"
 
 #if !defined(__WXMSW__) && !defined(__WXPM__)
     #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();
 


@@ -48,12 +61,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;
 }


@@ -62,13 +84,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,


@@ -87,8 +115,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;
 }


@@ -97,6 +130,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);


@@ -106,14 +143,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;
 }


@@ -171,14 +212,77 @@ wxPanel *CreatePage(wxBookCtrlBase *parent, const wxString&pageName)
     if ( pageName == MAXIMIZED_BUTTON_PAGE_NAME )
         return CreateBigButtonPage(parent);
 
     if ( pageName == MAXIMIZED_BUTTON_PAGE_NAME )
         return CreateBigButtonPage(parent);
 

-    wxFAIL_MSG( _T("unknown page name") );
+    wxFAIL_MSG( wxT("unknown page name") );

 
     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_RANGE(ID_FIXEDWIDTH, ID_HORZ_LAYOUT, MyFrame::OnStyle)
+    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_CHANGE_SELECTION, MyFrame::OnChangeSelection)
+    EVT_MENU(ID_SET_SELECTION, MyFrame::OnSetSelection)
+
+#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


@@ -187,13 +291,19 @@ MyFrame::MyFrame()
     m_type = Type_Listbook;
 #elif wxUSE_TREEBOOK
     m_type = Type_Treebook;
     m_type = Type_Listbook;
 #elif wxUSE_TREEBOOK
     m_type = Type_Treebook;

-#elif
+#elif wxUSE_TOOLBOOK
+    m_type = Type_Toolbook;
+#else

     #error "Don't use Notebook sample without any book enabled in wxWidgets build!"
 #endif
 
     m_orient = ID_ORIENT_DEFAULT;
     m_chkShowImages = true;
     #error "Don't use Notebook sample without any book enabled in wxWidgets build!"
 #endif
 
     m_orient = ID_ORIENT_DEFAULT;
     m_chkShowImages = true;

+    m_fixedWidth = false;

     m_multi = false;
     m_multi = false;

+    m_noPageTheme = false;
+    m_buttonBar = false;
+    m_horzLayout = false;

 
     SetIcon(wxICON(sample));
 
 
     SetIcon(wxICON(sample));
 


@@ -211,40 +321,64 @@ MyFrame::MyFrame()
 #if wxUSE_TREEBOOK
     menuType->AppendRadioItem(ID_BOOK_TREEBOOK,   wxT("&Treebook\tCtrl-4"));
 #endif
 #if wxUSE_TREEBOOK
     menuType->AppendRadioItem(ID_BOOK_TREEBOOK,   wxT("&Treebook\tCtrl-4"));
 #endif

+#if wxUSE_TOOLBOOK
+    menuType->AppendRadioItem(ID_BOOK_TOOLBOOK,   wxT("T&oolbook\tCtrl-5"));
+#endif

 
     menuType->Check(ID_BOOK_NOTEBOOK + m_type, true);
 
     wxMenu *menuOrient = new wxMenu;
 
     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 *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"));
+    wxMenu *menuStyle = new wxMenu;
+#if wxUSE_NOTEBOOK
+    menuStyle->AppendCheckItem(ID_FIXEDWIDTH, wxT("&Fixed Width (wxNotebook)"));
+    menuStyle->AppendCheckItem(ID_MULTI, wxT("&Multiple lines (wxNotebook)"));
+    menuStyle->AppendCheckItem(ID_NOPAGETHEME, wxT("&No Page Theme (wxNotebook)"));
+#endif
+#if wxUSE_TOOLBOOK
+    menuStyle->AppendCheckItem(ID_BUTTONBAR, wxT("&Button Bar (wxToolbook)"));
+    menuStyle->AppendCheckItem(ID_HORZ_LAYOUT, wxT("&Horizontal layout (wxToolbook)"));
+#endif
+
+    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_NEXT_PAGE, wxT("&Next page\tAlt-N"));

 #if wxUSE_TREEBOOK
 #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"));
+    menuPageOperations->AppendSeparator();
+    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
 #endif

+    menuPageOperations->AppendSeparator();
+    menuPageOperations->Append(ID_CHANGE_SELECTION, wxT("&Change selection to 0\tCtrl-0"));
+    menuPageOperations->Append(ID_SET_SELECTION, wxT("&Set selection to 0\tShift-Ctrl-0"));
+
+    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;
     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"));
 
     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->Append(wxID_ANY, wxT("&Style"), menuStyle, wxT("Style of control"));

     menuFile->AppendSeparator();
     menuFile->Append(wxID_EXIT, wxT("E&xit"), wxT("Quits the application"));
     menuFile->Check(ID_SHOW_IMAGES, m_chkShowImages);
     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"));
 
     wxMenuBar *menuBar = new wxMenuBar;
     menuBar->Append(menuFile, wxT("&File"));

+    menuBar->Append(menuPageOperations, wxT("&Pages"));

     menuBar->Append(menuOperations, wxT("&Operations"));
     SetMenuBar(menuBar);
 
     menuBar->Append(menuOperations, wxT("&Operations"));
     SetMenuBar(menuBar);
 


@@ -285,11 +419,11 @@ MyFrame::MyFrame()
     RecreateBook();
 
     m_panel->SetSizer(m_sizerFrame);
     RecreateBook();
 
     m_panel->SetSizer(m_sizerFrame);

+    m_panel->Layout();

 
 

-    m_sizerFrame->Fit(this);
-    m_sizerFrame->SetSizeHints(this);
-
-    Centre(wxBOTH);
+    wxBoxSizer *sizer = new wxBoxSizer(wxVERTICAL);
+    sizer->Add(m_panel, wxSizerFlags(1).Expand());
+    SetSizerAndFit(sizer);

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


@@ -311,78 +445,91 @@ MyFrame::~MyFrame()
     #define CASE_NOTEBOOK(x)
 #endif
 
     #define CASE_NOTEBOOK(x)
 #endif
 

-#if wxUSE_CHOICEBOOK
-    #define CASE_CHOICEBOOK(x) case Type_Choicebook: x; break;
-#else
-    #define CASE_CHOICEBOOK(x)
-#endif
-

 #if wxUSE_LISTBOOK
     #define CASE_LISTBOOK(x) case Type_Listbook: x; break;
 #else
     #define CASE_LISTBOOK(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
 
 #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)                       \
+#if wxUSE_TOOLBOOK
+    #define CASE_TOOLBOOK(x) case Type_Toolbook: x; break;
+#else
+    #define CASE_TOOLBOOK(x)
+#endif
+
+#define DISPATCH_ON_TYPE(before, nb, lb, cb, tb, toolb, after)                \

     switch ( m_type )                                                         \
     {                                                                         \
         CASE_NOTEBOOK(before nb after)                                        \
     switch ( m_type )                                                         \
     {                                                                         \
         CASE_NOTEBOOK(before nb after)                                        \

-        CASE_CHOICEBOOK(before cb after)                                      \

         CASE_LISTBOOK(before lb after)                                        \
         CASE_LISTBOOK(before lb after)                                        \

+        CASE_CHOICEBOOK(before cb after)                                      \

         CASE_TREEBOOK(before tb after)                                        \
         CASE_TREEBOOK(before tb after)                                        \

+        CASE_TOOLBOOK(before toolb after)                                     \

                                                                               \
         default:                                                              \
                                                                               \
         default:                                                              \

-            wxFAIL_MSG( _T("unknown book control type") );                    \
+            wxFAIL_MSG( wxT("unknown book control type") );                    \

     }
 
     }
 

-int MyFrame::TranslateBookFlag(int nb, int lb, int chb, int tbk) const
+int MyFrame::TranslateBookFlag(int nb, int lb, int chb, int tbk, int toolbk) const

 {
     int flag = 0;
 
 {
     int flag = 0;
 

-    DISPATCH_ON_TYPE(flag =, nb,  lb,  chb,  tbk, + 0);
+    DISPATCH_ON_TYPE(flag =, nb,  lb,  chb,  tbk, toolbk, + 0);

 
     return flag;
 }
 
 void MyFrame::RecreateBook()
 {
 
     return flag;
 }
 
 void MyFrame::RecreateBook()
 {

-#define SELECT_FLAG(flag) \
-    TranslateBookFlag(wxNB_##flag, wxCHB_##flag, wxLB_##flag, wxTBK_##flag)
-

     int flags;
     switch ( m_orient )
     {
         case ID_ORIENT_TOP:
     int flags;
     switch ( m_orient )
     {
         case ID_ORIENT_TOP:

-            flags = SELECT_FLAG(TOP);
+            flags = wxBK_TOP;

             break;
 
         case ID_ORIENT_BOTTOM:
             break;
 
         case ID_ORIENT_BOTTOM:

-            flags = SELECT_FLAG(BOTTOM);
+            flags = wxBK_BOTTOM;

             break;
 
         case ID_ORIENT_LEFT:
             break;
 
         case ID_ORIENT_LEFT:

-            flags = SELECT_FLAG(LEFT);
+            flags = wxBK_LEFT;

             break;
 
         case ID_ORIENT_RIGHT:
             break;
 
         case ID_ORIENT_RIGHT:

-            flags = SELECT_FLAG(RIGHT);
+            flags = wxBK_RIGHT;

             break;
 
         default:
             break;
 
         default:

-            flags = SELECT_FLAG(DEFAULT);
+            flags = wxBK_DEFAULT;

     }
 
     }
 

-#undef SELECT_FLAG
-
+#if wxUSE_NOTEBOOK
+    if ( m_fixedWidth && m_type == Type_Notebook )
+        flags |= wxNB_FIXEDWIDTH;

     if ( m_multi && m_type == Type_Notebook )
         flags |= wxNB_MULTILINE;
     if ( m_multi && m_type == Type_Notebook )
         flags |= wxNB_MULTILINE;

-    flags |= wxDOUBLE_BORDER;
+    if ( m_noPageTheme && m_type == Type_Notebook )
+        flags |= wxNB_NOPAGETHEME;
+#endif
+#if wxUSE_TOOLBOOK
+    if ( m_buttonBar && m_type == Type_Toolbook )
+        flags |= wxTBK_BUTTONBAR;
+    if ( m_horzLayout && m_type == Type_Toolbook )
+        flags |= wxTBK_HORZ_LAYOUT;
+#endif

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


@@ -390,9 +537,10 @@ void MyFrame::RecreateBook()
 
     DISPATCH_ON_TYPE(m_bookCtrl = new,
                          wxNotebook,
 
     DISPATCH_ON_TYPE(m_bookCtrl = new,
                          wxNotebook,

-                         wxChoicebook,

                          wxListbook,
                          wxListbook,

+                         wxChoicebook,

                          wxTreebook,
                          wxTreebook,

+                         wxToolbook,

                      (m_panel, wxID_ANY, wxDefaultPosition, wxDefaultSize, flags));
 
     if ( !m_bookCtrl )
                      (m_panel, wxID_ANY, wxDefaultPosition, wxDefaultSize, flags));
 
     if ( !m_bookCtrl )


@@ -400,7 +548,8 @@ void MyFrame::RecreateBook()
 
     m_bookCtrl->Hide();
 
 
     m_bookCtrl->Hide();
 

-    if ( m_chkShowImages )
+    // wxToolbook doesn't work without icons so always use them for it.
+    if ( m_chkShowImages || m_type == Type_Toolbook )

     {
         m_bookCtrl->SetImageList(m_imageList);
     }
     {
         m_bookCtrl->SetImageList(m_imageList);
     }


@@ -430,7 +579,7 @@ void MyFrame::RecreateBook()
                 if ( parent != wxNOT_FOUND )
                 {
                     wxStaticCast(m_bookCtrl, wxTreebook)->
                 if ( parent != wxNOT_FOUND )
                 {
                     wxStaticCast(m_bookCtrl, wxTreebook)->

-                        AddSubPage(parent, page, str, false, image);
+                        InsertSubPage(parent, page, str, false, image);

 
                     // skip adding it again below
                     continue;
 
                     // skip adding it again below
                     continue;


@@ -460,53 +609,71 @@ 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)
+void MyFrame::AddFlagStrIfFlagPresent(wxString & flagStr, long flags, long flag,
+                                      const wxChar * flagName) const
+{
+    if( (flags & flag) == flag )
+    {
+        if( !flagStr.empty() )
+            flagStr += wxT(" | ");
+        flagStr += flagName;
+    }
+}

 
 

-    // 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_ADD_SUB_PAGE, MyFrame::OnAddSubPage)
-    EVT_MENU(ID_ADD_PAGE_BEFORE, MyFrame::OnAddPageBefore)
+wxPanel *MyFrame::CreateNewPage() const
+{
+    wxPanel *panel = new wxPanel(m_bookCtrl, wxID_ANY );

 
 

-    // 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_CHOICEBOOK
-    EVT_TREEBOOK_PAGE_CHANGED(wxID_ANY, MyFrame::OnTreebook)
-    EVT_TREEBOOK_PAGE_CHANGING(wxID_ANY, MyFrame::OnTreebook)
+#if wxUSE_HELP
+    panel->SetHelpText( wxT( "Panel with \"First\" and \"Second\" buttons" ) );

 #endif
 
 #endif
 

-    // Update title in idle time
-    EVT_IDLE(MyFrame::OnIdle)
+    (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;
+}

 
 

-#if wxUSE_TREEBOOK
-    EVT_UPDATE_UI_RANGE(ID_ADD_PAGE_BEFORE, ID_ADD_SUB_PAGE,
-                            MyFrame::OnUpdateTreeMenu)
-#endif // wxUSE_TREEBOOK
-END_EVENT_TABLE()
+
+//-----------------------------------------------------------------------------
+// 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();
+    const wxPoint pt = ::wxGetMousePosition();
+
+    long flags;
+    int pagePos = book->HitTest( book->ScreenToClient(pt), &flags );
+
+    wxString flagsStr;
+
+    AddFlagStrIfFlagPresent( flagsStr, flags, wxBK_HITTEST_NOWHERE, wxT("wxBK_HITTEST_NOWHERE") );
+    AddFlagStrIfFlagPresent( flagsStr, flags, wxBK_HITTEST_ONICON,  wxT("wxBK_HITTEST_ONICON") );
+    AddFlagStrIfFlagPresent( flagsStr, flags, wxBK_HITTEST_ONLABEL, wxT("wxBK_HITTEST_ONLABEL") );
+    AddFlagStrIfFlagPresent( flagsStr, flags, wxBK_HITTEST_ONPAGE,  wxT("wxBK_HITTEST_ONPAGE") );
+
+    wxLogMessage(wxT("HitTest at (%d,%d): %d: %s"),
+                 pt.x,
+                 pt.y,
+                 pagePos,
+                 flagsStr.c_str());
+}

 
 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);


@@ -523,7 +690,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();


@@ -538,12 +704,21 @@ void MyFrame::OnShowImages(wxCommandEvent& event)
     m_sizerFrame->Layout();
 }
 
     m_sizerFrame->Layout();
 }
 

-void MyFrame::OnMulti(wxCommandEvent& event)
+void MyFrame::OnStyle(wxCommandEvent& event)

 {
 {

-    m_multi = event.IsChecked();
+    bool checked = event.IsChecked();
+    switch (event.GetId())
+    {
+        case ID_FIXEDWIDTH:  m_fixedWidth = checked;  break;
+        case ID_MULTI:       m_multi = checked;       break;
+        case ID_NOPAGETHEME: m_noPageTheme = checked; break;
+        case ID_BUTTONBAR:   m_buttonBar = checked;   break;
+        case ID_HORZ_LAYOUT: m_horzLayout = checked;  break;
+        default: break; // avoid compiler warning
+    }
+

     RecreateBook();
     m_sizerFrame->Layout();
     RecreateBook();
     m_sizerFrame->Layout();

-    wxLogMessage(_T("Multiline setting works only in wxNotebook."));

 }
 
 void MyFrame::OnExit(wxCommandEvent& WXUNUSED(event))
 }
 
 void MyFrame::OnExit(wxCommandEvent& WXUNUSED(event))


@@ -551,16 +726,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();
 


@@ -573,7 +757,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));
     }
 }


@@ -587,20 +771,23 @@ void MyFrame::OnAddSubPage(wxCommandEvent& WXUNUSED(event))
         const int selPos = currBook->GetSelection();
         if ( selPos == wxNOT_FOUND )
         {
         const int selPos = currBook->GetSelection();
         if ( selPos == wxNOT_FOUND )
         {

-            wxLogError(_T("Select the parent page first!"));
+            wxLogError(wxT("Select the parent page first!"));

             return;
         }
 
         static unsigned s_subPageAdded = 0;
             return;
         }
 
         static unsigned s_subPageAdded = 0;

-        currBook->AddSubPage(selPos,
-                             CreateNewPage(),
-                             wxString::Format
-                             (
-                                ADDED_SUB_PAGE_NAME wxT("%u"),
-                                ++s_subPageAdded
-                             ),
-                             true,
-                             GetIconIndex(currBook));
+        currBook->InsertSubPage
+                  (
+                    selPos,
+                    CreateNewPage(),
+                    wxString::Format
+                    (
+                     ADDED_SUB_PAGE_NAME wxT("%u"),
+                     ++s_subPageAdded
+                    ),
+                    true,
+                    GetIconIndex(currBook)
+                  );

     }
 }
 
     }
 }
 


@@ -612,7 +799,7 @@ void MyFrame::OnAddPageBefore(wxCommandEvent& WXUNUSED(event))
         const int selPos = currBook->GetSelection();
         if ( selPos == wxNOT_FOUND )
         {
         const int selPos = currBook->GetSelection();
         if ( selPos == wxNOT_FOUND )
         {

-            wxLogError(_T("Select the parent page first!"));
+            wxLogError(wxT("Select the parent page first!"));

             return;
         }
 
             return;
         }
 


@@ -688,6 +875,22 @@ void MyFrame::OnNextPage(wxCommandEvent& WXUNUSED(event))
     }
 }
 
     }
 }
 

+void MyFrame::OnChangeSelection(wxCommandEvent& WXUNUSED(event))
+{
+    wxBookCtrlBase *currBook = GetCurrentBook();
+
+    if ( currBook )
+        currBook->ChangeSelection(0);
+}
+
+void MyFrame::OnSetSelection(wxCommandEvent& WXUNUSED(event))
+{
+    wxBookCtrlBase *currBook = GetCurrentBook();
+
+    if ( currBook )
+        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;


@@ -731,30 +934,37 @@ void MyFrame::OnBookCtrl(wxBookCtrlBaseEvent& event)
         {
             wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGED,
             wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGING,
         {
             wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGED,
             wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGING,

-            _T("wxNotebook")
+            wxT("wxNotebook")

         },
 #endif // wxUSE_NOTEBOOK
         },
 #endif // wxUSE_NOTEBOOK

-#if wxUSE_CHOICEBOOK
-        {
-            wxEVT_COMMAND_CHOICEBOOK_PAGE_CHANGED,
-            wxEVT_COMMAND_CHOICEBOOK_PAGE_CHANGING,
-            _T("wxChoicebook")
-        },
-#endif // wxUSE_CHOICEBOOK

 #if wxUSE_LISTBOOK
         {
             wxEVT_COMMAND_LISTBOOK_PAGE_CHANGED,
             wxEVT_COMMAND_LISTBOOK_PAGE_CHANGING,
 #if wxUSE_LISTBOOK
         {
             wxEVT_COMMAND_LISTBOOK_PAGE_CHANGED,
             wxEVT_COMMAND_LISTBOOK_PAGE_CHANGING,

-            _T("wxListbook")
+            wxT("wxListbook")

         },
 #endif // wxUSE_LISTBOOK
         },
 #endif // wxUSE_LISTBOOK

+#if wxUSE_CHOICEBOOK
+        {
+            wxEVT_COMMAND_CHOICEBOOK_PAGE_CHANGED,
+            wxEVT_COMMAND_CHOICEBOOK_PAGE_CHANGING,
+            wxT("wxChoicebook")
+        },
+#endif // wxUSE_CHOICEBOOK

 #if wxUSE_TREEBOOK
         {
             wxEVT_COMMAND_TREEBOOK_PAGE_CHANGED,
             wxEVT_COMMAND_TREEBOOK_PAGE_CHANGING,
 #if wxUSE_TREEBOOK
         {
             wxEVT_COMMAND_TREEBOOK_PAGE_CHANGED,
             wxEVT_COMMAND_TREEBOOK_PAGE_CHANGING,

-            _T("wxTreebook")
+            wxT("wxTreebook")

         },
 #endif // wxUSE_TREEBOOK
         },
 #endif // wxUSE_TREEBOOK

+#if wxUSE_TOOLBOOK
+        {
+            wxEVT_COMMAND_TOOLBOOK_PAGE_CHANGED,
+            wxEVT_COMMAND_TOOLBOOK_PAGE_CHANGING,
+            wxT("wxToolbook")
+        },
+#endif // wxUSE_TOOLBOOK

     };
 
 
     };
 
 


@@ -762,6 +972,12 @@ void MyFrame::OnBookCtrl(wxBookCtrlBaseEvent& event)
              nameControl,
              veto;
     const wxEventType eventType = event.GetEventType();
              nameControl,
              veto;
     const wxEventType eventType = event.GetEventType();

+
+    // NB: can't use wxStaticCast here as wxBookCtrlBase is not in
+    //     wxRTTI
+    const wxBookCtrlBase * const
+        book = static_cast<wxBookCtrlBase *>(event.GetEventObject());
+

     for ( size_t n = 0; n < WXSIZEOF(events); n++ )
     {
         const EventInfo& ei = events[n];
     for ( size_t n = 0; n < WXSIZEOF(events); n++ )
     {
         const EventInfo& ei = events[n];


@@ -772,8 +988,7 @@ void MyFrame::OnBookCtrl(wxBookCtrlBaseEvent& event)
         else if ( eventType == ei.typeChanging )
         {
             const int idx = event.GetOldSelection();
         else if ( eventType == ei.typeChanging )
         {
             const int idx = event.GetOldSelection();

-            const wxBookCtrlBase * const
-                book = wxStaticCast(event.GetEventObject(), wxBookCtrlBase);
+

             if ( idx != wxNOT_FOUND &&
                     book && book->GetPageText(idx) == VETO_PAGE_NAME )
             {
             if ( idx != wxNOT_FOUND &&
                     book && book->GetPageText(idx) == VETO_PAGE_NAME )
             {


@@ -787,7 +1002,7 @@ void MyFrame::OnBookCtrl(wxBookCtrlBaseEvent& event)
                      ) != wxYES )
                 {
                     event.Veto();
                      ) != wxYES )
                 {
                     event.Veto();

-                    veto = _T(" (vetoed)");
+                    veto = wxT(" (vetoed)");

                 }
             }
 
                 }
             }
 


@@ -804,17 +1019,17 @@ void MyFrame::OnBookCtrl(wxBookCtrlBaseEvent& event)
 
     static int s_num = 0;
 
 
     static int s_num = 0;
 

-    wxLogMessage(wxT("Event #%d: %s: %s (%d) new sel %d, old %d%s"),
+    wxLogMessage(wxT("Event #%d: %s: %s (%d) new sel %d, old %d, current %d%s"),

                  ++s_num,
                  nameControl.c_str(),
                  nameEvent.c_str(),
                  eventType,
                  event.GetSelection(),
                  event.GetOldSelection(),
                  ++s_num,
                  nameControl.c_str(),
                  nameEvent.c_str(),
                  eventType,
                  event.GetSelection(),
                  event.GetOldSelection(),

+                 book->GetSelection(),

                  veto.c_str());
 
 #if USE_LOG
     m_text->SetInsertionPointEnd();
 #endif
 }
                  veto.c_str());
 
 #if USE_LOG
     m_text->SetInsertionPointEnd();
 #endif
 }

-