X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/d52f6c4eed6b400b2c2895292ccb0615e2e076bb..85e5bb6a953e5dffd5c52d907b4ca0767a544bcc:/samples/notebook/notebook.cpp diff --git a/samples/notebook/notebook.cpp b/samples/notebook/notebook.cpp index ad083b352e..b0eb08c72f 100644 --- a/samples/notebook/notebook.cpp +++ b/samples/notebook/notebook.cpp @@ -33,7 +33,7 @@ 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 @@ -153,51 +153,40 @@ void CreateInitialPages(wxBookCtrlBase *parent) wxPanel *CreatePage(wxBookCtrlBase *parent, const wxString&pageName) { - if - ( - pageName.Contains(INSERTED_PAGE_NAME) - || pageName.Contains(ADDED_PAGE_NAME) - ) - { + 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); - } - if (pageName == I_WAS_INSERTED_PAGE_NAME) - { + if ( pageName == I_WAS_INSERTED_PAGE_NAME ) return CreateInsertPage(parent); - } - if (pageName == VETO_PAGE_NAME) - { + if ( pageName == VETO_PAGE_NAME ) return CreateVetoPage(parent); - } - if (pageName == RADIOBUTTONS_PAGE_NAME) - { + if ( pageName == RADIOBUTTONS_PAGE_NAME ) return CreateRadioButtonsPage(parent); - } - - if (pageName == MAXIMIZED_BUTTON_PAGE_NAME) - { + if ( pageName == MAXIMIZED_BUTTON_PAGE_NAME ) return CreateBigButtonPage(parent); - } - wxFAIL; + wxFAIL_MSG( _T("unknown page name") ); - return (wxPanel *) NULL; + return NULL; } -MyFrame::MyFrame(const wxString& title, const wxPoint& pos, const wxSize& size, - long style) - : wxFrame((wxWindow *) NULL, wxID_ANY, title, pos, size, style) +MyFrame::MyFrame() + : wxFrame(NULL, wxID_ANY, wxString(wxT("wxWidgets book controls sample"))) { #if wxUSE_NOTEBOOK - m_type = ID_BOOK_NOTEBOOK; + m_type = Type_Notebook; #elif wxUSE_CHOICEBOOK - m_type = ID_BOOK_CHOICEBOOK; + m_type = Type_Choicebook; #elif wxUSE_LISTBOOK - m_type = ID_BOOK_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 @@ -219,21 +208,33 @@ MyFrame::MyFrame(const wxString& title, const wxPoint& pos, const wxSize& size, #if wxUSE_CHOICEBOOK menuType->AppendRadioItem(ID_BOOK_CHOICEBOOK, wxT("&Choicebook\tCtrl-3")); #endif - menuType->Check(m_type, true); +#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; - menuOrient->AppendRadioItem(ID_ORIENT_DEFAULT, wxT("&Default\tCtrl-4")); - menuOrient->AppendRadioItem(ID_ORIENT_TOP, wxT("&Top\tCtrl-5")); - menuOrient->AppendRadioItem(ID_ORIENT_BOTTOM, wxT("&Bottom\tCtrl-6")); - menuOrient->AppendRadioItem(ID_ORIENT_LEFT, wxT("&Left\tCtrl-7")); - menuOrient->AppendRadioItem(ID_ORIENT_RIGHT, wxT("&Right\tCtrl-8")); - - wxMenu *menuDo = new wxMenu; - menuDo->Append(ID_ADD_PAGE, wxT("&Add page\tAlt-A")); - menuDo->Append(ID_INSERT_PAGE, wxT("&Insert page\tAlt-I")); - menuDo->Append(ID_DELETE_CUR_PAGE, wxT("&Delete current page\tAlt-D")); - menuDo->Append(ID_DELETE_LAST_PAGE, wxT("D&elete last page\tAlt-L")); - menuDo->Append(ID_NEXT_PAGE, wxT("&Next page\tAlt-N")); + 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 wxMenu *menuFile = new wxMenu; menuFile->Append(wxID_ANY, wxT("&Type"), menuType, wxT("Type of control")); @@ -247,54 +248,32 @@ MyFrame::MyFrame(const wxString& title, const wxPoint& pos, const wxSize& size, wxMenuBar *menuBar = new wxMenuBar; menuBar->Append(menuFile, wxT("&File")); - menuBar->Append(menuDo, wxT("&Operations")); + menuBar->Append(menuOperations, wxT("&Operations")); SetMenuBar(menuBar); // books creation - - m_panel = (wxPanel *) NULL; -#if wxUSE_NOTEBOOK - m_notebook = (wxNotebook *) NULL; -#endif -#if wxUSE_CHOICEBOOK - m_choicebook = (wxChoicebook *) NULL; -#endif -#if wxUSE_LISTBOOK - m_listbook = (wxListbook *) NULL; -#endif + m_panel = NULL; + m_bookCtrl = NULL; // create a dummy image list with a few icons - wxSize imageSize(32, 32); - - m_imageList - = new wxImageList( imageSize.GetWidth(), imageSize.GetHeight() ); - - m_imageList->Add - ( - wxArtProvider::GetIcon(wxART_INFORMATION, wxART_OTHER, imageSize) - ); + const wxSize imageSize(32, 32); - m_imageList->Add - ( - wxArtProvider::GetIcon(wxART_QUESTION, wxART_OTHER, imageSize) - ); + 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_imageList->Add - ( - wxArtProvider::GetIcon(wxART_WARNING, wxART_OTHER, imageSize) - ); - - m_imageList->Add - ( - wxArtProvider::GetIcon(wxART_ERROR, wxART_OTHER, imageSize) - ); - - m_panel = new wxPanel(this, wxID_ANY, wxDefaultPosition, wxDefaultSize, - wxTAB_TRAVERSAL | wxCLIP_CHILDREN | wxNO_BORDER | wxNO_FULL_REPAINT_ON_RESIZE); + m_panel = new wxPanel(this); #if USE_LOG 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) ); #endif // USE_LOG @@ -306,7 +285,7 @@ MyFrame::MyFrame(const wxString& title, const wxPoint& pos, const wxSize& size, m_sizerFrame->Add(m_text, 1, wxEXPAND); #endif // USE_LOG - RecreateBooks(); + RecreateBook(); m_panel->SetSizer(m_sizerFrame); @@ -322,160 +301,178 @@ MyFrame::~MyFrame() delete wxLog::SetActiveTarget(m_logTargetOld); #endif // USE_LOG - if (m_imageList) - { - delete m_imageList; - m_imageList = (wxImageList *) NULL; - } + delete m_imageList; } -int MyFrame::SelectFlag(int id, int nb, int lb, int chb) -{ - switch (id) - { - case ID_NOTEBOOK: return nb; - case ID_LISTBOOK: return lb; - case ID_CHOICEBOOK: return chb; - } - return 0; -} - -#ifdef __SMARTPHONE__ - #define MARGIN 0 +// 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 after" where "xxx" +// part is control class-specific +#if wxUSE_NOTEBOOK + #define CASE_NOTEBOOK(x) case Type_Notebook: x; break; #else - #define MARGIN 4 + #define CASE_NOTEBOOK(x) #endif -#define RECREATE( wxBookType , idBook, oldBook , newBook ) \ -{ \ - int flags; \ - \ - switch ( m_orient ) \ - { \ - case ID_ORIENT_TOP: \ - flags = SelectFlag(idBook, wxNB_TOP, wxLB_TOP, wxCHB_TOP); \ - break; \ - \ - case ID_ORIENT_BOTTOM: \ - flags = SelectFlag(idBook, wxNB_BOTTOM, wxLB_BOTTOM, wxCHB_BOTTOM); \ - break; \ - \ - case ID_ORIENT_LEFT: \ - flags = SelectFlag(idBook, wxNB_LEFT, wxLB_LEFT, wxCHB_LEFT); \ - break; \ - \ - case ID_ORIENT_RIGHT: \ - flags = SelectFlag(idBook, wxNB_RIGHT, wxLB_RIGHT, wxCHB_RIGHT); \ - break; \ - \ - default: \ - flags = SelectFlag(idBook, wxNB_DEFAULT, wxLB_DEFAULT, wxCHB_DEFAULT); \ - } \ - \ - if ( m_multi && ( idBook == ID_NOTEBOOK ) ) \ - flags |= wxNB_MULTILINE; \ - \ - wxBookType *oldBook = newBook; \ - \ - newBook = new wxBookType(m_panel, idBook, \ - wxDefaultPosition, wxDefaultSize, \ - flags); \ - \ - if ( m_chkShowImages ) \ - { \ - newBook->SetImageList(m_imageList); \ - } \ - \ - if (oldBook) \ - { \ - int sel = oldBook->GetSelection(); \ - \ - int count = oldBook->GetPageCount(); \ - for (int n = 0; n < count; n++) \ - { \ - wxString str = oldBook->GetPageText(n); \ - \ - wxWindow *page = CreatePage(newBook, str); \ - newBook->AddPage(page, str, false, GetIconIndex(newBook) ); \ - } \ - \ - m_sizerFrame->Detach(oldBook); \ - \ - delete oldBook; \ - \ - if (sel != wxNOT_FOUND) \ - { \ - newBook->SetSelection(sel); \ - } \ - \ - } \ - else \ - { \ - CreateInitialPages(newBook); \ - } \ - \ - m_sizerFrame->Insert(0, newBook, 5, wxEXPAND | wxALL, MARGIN); \ - \ - m_sizerFrame->Hide(newBook); \ -} - -void MyFrame::RecreateBooks() -{ -#if wxUSE_NOTEBOOK - RECREATE( wxNotebook , ID_NOTEBOOK , notebook , m_notebook ); -#endif #if wxUSE_LISTBOOK - RECREATE( wxListbook , ID_LISTBOOK , listbook , m_listbook ); + #define CASE_LISTBOOK(x) case Type_Listbook: x; break; +#else + #define CASE_LISTBOOK(x) #endif + #if wxUSE_CHOICEBOOK - RECREATE( wxChoicebook , ID_CHOICEBOOK , choicebook , m_choicebook ); + #define CASE_CHOICEBOOK(x) case Type_Choicebook: x; break; +#else + #define CASE_CHOICEBOOK(x) #endif - ShowCurrentBook(); -} - -wxBookCtrlBase *MyFrame::GetCurrentBook() -{ - switch (m_type) - { -#if wxUSE_NOTEBOOK - case ID_BOOK_NOTEBOOK: return m_notebook; -#endif -#if wxUSE_LISTBOOK - case ID_BOOK_LISTBOOK: return m_listbook; +#if wxUSE_TREEBOOK + #define CASE_TREEBOOK(x) case Type_Treebook: x; break; +#else + #define CASE_TREEBOOK(x) #endif -#if wxUSE_CHOICEBOOK - case ID_BOOK_CHOICEBOOK: return m_choicebook; + +#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) \ + CASE_LISTBOOK(before lb after) \ + CASE_CHOICEBOOK(before cb after) \ + CASE_TREEBOOK(before tb after) \ + CASE_TOOLBOOK(before toolb after) \ + \ + default: \ + wxFAIL_MSG( _T("unknown book control type") ); \ } - return NULL; + +int MyFrame::TranslateBookFlag(int nb, int lb, int chb, int tbk, int toolbk) const +{ + int flag = 0; + + DISPATCH_ON_TYPE(flag =, nb, lb, chb, tbk, toolbk, + 0); + + return flag; } -void MyFrame::ShowCurrentBook() +void MyFrame::RecreateBook() { - switch(m_type) + int flags; + switch ( m_orient ) { -#if wxUSE_NOTEBOOK - case ID_BOOK_NOTEBOOK: if(m_notebook) m_sizerFrame->Show(m_notebook); break; -#endif -#if wxUSE_LISTBOOK - case ID_BOOK_LISTBOOK: if(m_listbook) m_sizerFrame->Show(m_listbook); break; -#endif -#if wxUSE_CHOICEBOOK - case ID_BOOK_CHOICEBOOK: if(m_choicebook) m_sizerFrame->Show(m_choicebook); break; -#endif + case ID_ORIENT_TOP: + flags = wxBK_TOP; + break; + + case ID_ORIENT_BOTTOM: + flags = wxBK_BOTTOM; + break; + + case ID_ORIENT_LEFT: + flags = wxBK_LEFT; + break; + + case ID_ORIENT_RIGHT: + flags = wxBK_RIGHT; + break; + + default: + flags = wxBK_DEFAULT; } + if ( m_multi && m_type == Type_Notebook ) + flags |= wxNB_MULTILINE; + flags |= wxDOUBLE_BORDER; + + wxBookCtrlBase *oldBook = m_bookCtrl; + + m_bookCtrl = NULL; + + DISPATCH_ON_TYPE(m_bookCtrl = new, + wxNotebook, + wxListbook, + wxChoicebook, + wxTreebook, + wxToolbook, + (m_panel, wxID_ANY, wxDefaultPosition, wxDefaultSize, flags)); + + if ( !m_bookCtrl ) + return; + + m_bookCtrl->Hide(); + + if ( m_chkShowImages ) + { + m_bookCtrl->SetImageList(m_imageList); + } + + if ( oldBook ) + { +#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++ ) + { + const int image = GetIconIndex(m_bookCtrl); + const wxString str = oldBook->GetPageText(n); + + wxWindow *page = CreatePage(m_bookCtrl, str); + + // 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)-> + InsertSubPage(parent, page, str, false, image); + + // skip adding it again below + continue; + } + } +#endif // wxUSE_TREEBOOK + + 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_sizerFrame->Show(m_bookCtrl); 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_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) + EVT_MENU(wxID_EXIT, MyFrame::OnExit) // Operations menu EVT_MENU(ID_ADD_PAGE, MyFrame::OnAddPage) @@ -486,16 +483,29 @@ BEGIN_EVENT_TABLE(MyFrame, wxFrame) // Book controls #if wxUSE_NOTEBOOK - EVT_NOTEBOOK_PAGE_CHANGED(ID_NOTEBOOK, MyFrame::OnNotebook) - EVT_NOTEBOOK_PAGE_CHANGING(ID_NOTEBOOK, MyFrame::OnNotebook) + EVT_NOTEBOOK_PAGE_CHANGED(wxID_ANY, MyFrame::OnNotebook) + EVT_NOTEBOOK_PAGE_CHANGING(wxID_ANY, MyFrame::OnNotebook) #endif #if wxUSE_LISTBOOK - EVT_LISTBOOK_PAGE_CHANGED(ID_LISTBOOK, MyFrame::OnListbook) - EVT_LISTBOOK_PAGE_CHANGING(ID_LISTBOOK, MyFrame::OnListbook) + EVT_LISTBOOK_PAGE_CHANGED(wxID_ANY, MyFrame::OnListbook) + EVT_LISTBOOK_PAGE_CHANGING(wxID_ANY, MyFrame::OnListbook) #endif #if wxUSE_CHOICEBOOK - EVT_CHOICEBOOK_PAGE_CHANGED(ID_CHOICEBOOK, MyFrame::OnChoicebook) - EVT_CHOICEBOOK_PAGE_CHANGING(ID_CHOICEBOOK, MyFrame::OnChoicebook) + 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 @@ -504,34 +514,42 @@ END_EVENT_TABLE() void MyFrame::OnType(wxCommandEvent& event) { - wxBookCtrlBase *currBook = GetCurrentBook(); + m_type = wx_static_cast(BookType, event.GetId() - ID_BOOK_NOTEBOOK); - m_type = event.GetId(); + if ( m_bookCtrl ) + m_sizerFrame->Hide(m_bookCtrl); - if (currBook) - m_sizerFrame->Hide(currBook); + RecreateBook(); +} + +#if wxUSE_TREEBOOK - ShowCurrentBook(); +void MyFrame::OnUpdateTreeMenu(wxUpdateUIEvent& event) +{ + event.Enable(m_type == Type_Treebook); } +#endif // wxUSE_TREEBOOK + + void MyFrame::OnOrient(wxCommandEvent& event) { m_orient = event.GetId(); - RecreateBooks(); + RecreateBook(); m_sizerFrame->Layout(); } void MyFrame::OnShowImages(wxCommandEvent& event) { m_chkShowImages = event.IsChecked(); - RecreateBooks(); + RecreateBook(); m_sizerFrame->Layout(); } void MyFrame::OnMulti(wxCommandEvent& event) { m_multi = event.IsChecked(); - RecreateBooks(); + RecreateBook(); m_sizerFrame->Layout(); wxLogMessage(_T("Multiline setting works only in wxNotebook.")); } @@ -541,25 +559,88 @@ void MyFrame::OnExit(wxCommandEvent& WXUNUSED(event)) Close(); } -void MyFrame::OnAddPage(wxCommandEvent& WXUNUSED(event)) +wxPanel *MyFrame::CreateNewPage() const { - static unsigned s_pageAdded = 0; + 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)); + return panel; +} + +void MyFrame::OnAddPage(wxCommandEvent& WXUNUSED(event)) +{ wxBookCtrlBase *currBook = GetCurrentBook(); if ( currBook ) { - wxPanel *panel = new wxPanel( currBook, 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 ); - - currBook->AddPage(panel, wxString::Format(ADDED_PAGE_NAME wxT("%u"), - ++s_pageAdded), true, GetIconIndex(currBook) ); + static unsigned s_pageAdded = 0; + currBook->AddPage(CreateNewPage(), + wxString::Format + ( + ADDED_PAGE_NAME wxT("%u"), + ++s_pageAdded + ), + true, + GetIconIndex(currBook)); } } +#if wxUSE_TREEBOOK +void MyFrame::OnAddSubPage(wxCommandEvent& WXUNUSED(event)) +{ + 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->InsertSubPage + ( + selPos, + CreateNewPage(), + wxString::Format + ( + ADDED_SUB_PAGE_NAME wxT("%u"), + ++s_subPageAdded + ), + true, + GetIconIndex(currBook) + ); + } +} + +void MyFrame::OnAddPageBefore(wxCommandEvent& WXUNUSED(event)) +{ + 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::OnInsertPage(wxCommandEvent& WXUNUSED(event)) { static unsigned s_pageIns = 0; @@ -648,65 +729,112 @@ void MyFrame::OnIdle( wxIdleEvent& WXUNUSED(event) ) } } -#if USE_LOG - #define BOOKEVENT_LOG m_text->SetInsertionPointEnd(); -#else - #define BOOKEVENT_LOG -#endif - -#define BOOKEVENT(OnBook,wxBookEvent,bookStr,wxEVT_PAGE_CHANGED,wxEVT_PAGE_CHANGING,s_num) \ -void MyFrame::OnBook(wxBookEvent& event) \ -{ \ - wxString str = wxT("Unknown "); \ - str << wxT(bookStr); \ - str << wxT(" event"); \ - \ - wxEventType eventType = event.GetEventType(); \ - \ - if (eventType == wxEVT_PAGE_CHANGED) \ - { \ - str = wxT("Changed"); \ - } \ - else if (eventType == wxEVT_PAGE_CHANGING) \ - { \ - int idx = event.GetOldSelection(); \ - wxBookCtrlBase *book = (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(); \ - } \ - \ - } \ - \ - str = wxT("Changing"); \ - } \ - \ - static int s_num = 0; \ - \ - wxString logMsg; \ - logMsg.Printf(wxT("%s event #%d: %s (%d) Sel %d, OldSel %d"), \ - wxT(bookStr),s_num++, str.c_str(), eventType, \ - event.GetSelection(), event.GetOldSelection()); \ - \ - wxLogMessage(logMsg.c_str()); \ - \ - BOOKEVENT_LOG \ -} - +void MyFrame::OnBookCtrl(wxBookCtrlBaseEvent& event) +{ + static const struct EventInfo + { + wxEventType typeChanged, + typeChanging; + const wxChar *name; + } events[] = + { #if wxUSE_NOTEBOOK -BOOKEVENT(OnNotebook,wxNotebookEvent,"wxNotebook",wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGED,wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGING,s_numNotebookEvents) -#endif -#if wxUSE_CHOICEBOOK -BOOKEVENT(OnChoicebook,wxChoicebookEvent,"wxChoicebook",wxEVT_COMMAND_CHOICEBOOK_PAGE_CHANGED,wxEVT_COMMAND_CHOICEBOOK_PAGE_CHANGING,s_numChoicebookEvents) -#endif + { + wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGED, + wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGING, + _T("wxNotebook") + }, +#endif // wxUSE_NOTEBOOK #if wxUSE_LISTBOOK -BOOKEVENT(OnListbook,wxListbookEvent,"wxListbook",wxEVT_COMMAND_LISTBOOK_PAGE_CHANGED,wxEVT_COMMAND_LISTBOOK_PAGE_CHANGING,s_numListbookEvents) + { + 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 +#if wxUSE_TOOLBOOK + { + wxEVT_COMMAND_TOOLBOOK_PAGE_CHANGED, + wxEVT_COMMAND_TOOLBOOK_PAGE_CHANGING, + _T("wxToolbook") + }, +#endif // wxUSE_TOOLBOOK + }; + + + 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 +}