X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/582ca3535a3680817ec4448141437eb2812df090..58c69c44d03a02f3c07ca48fc788255ec7bf0c13:/samples/notebook/notebook.cpp diff --git a/samples/notebook/notebook.cpp b/samples/notebook/notebook.cpp index 0931f0a56d..31d2067898 100644 --- a/samples/notebook/notebook.cpp +++ b/samples/notebook/notebook.cpp @@ -22,18 +22,32 @@ #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 +//----------------------------------------------------------------------------- +// MyApp +//----------------------------------------------------------------------------- + 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(); + SetTopWindow(frame); // Problem with generic wxNotebook implementation whereby it doesn't size // properly unless you set the size again @@ -48,12 +62,21 @@ bool MyApp::OnInit() return true; } + +//----------------------------------------------------------------------------- +// Creation functions +//----------------------------------------------------------------------------- + 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"), - wxPoint(10, 10), wxDefaultSize ); + wxPoint(10, 10), wxDefaultSize ); return panel; } @@ -62,13 +85,19 @@ wxPanel *CreateRadioButtonsPage(wxBookCtrlBase *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); - 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, @@ -87,8 +116,13 @@ wxPanel *CreateVetoPage(wxBookCtrlBase *parent) { wxPanel *panel = new wxPanel(parent); +#if wxUSE_HELP + panel->SetHelpText( wxT( "An empty panel" ) ); +#endif + (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; } @@ -97,6 +131,10 @@ wxPanel *CreateBigButtonPage(wxBookCtrlBase *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); @@ -106,14 +144,18 @@ wxPanel *CreateBigButtonPage(wxBookCtrlBase *parent) return panel; } - 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, - wxT("This page has been inserted, not added."), wxPoint(10, 10) ); + wxT("This page has been inserted, not added."), + wxPoint(10, 10) ); return panel; } @@ -171,14 +213,76 @@ wxPanel *CreatePage(wxBookCtrlBase *parent, const wxString&pageName) if ( pageName == MAXIMIZED_BUTTON_PAGE_NAME ) return CreateBigButtonPage(parent); - wxFAIL_MSG( _T("unknown page name") ); + wxFAIL_MSG( wxT("unknown page name") ); return NULL; } + +//----------------------------------------------------------------------------- +// MyFrame +//----------------------------------------------------------------------------- + +BEGIN_EVENT_TABLE(MyFrame, wxFrame) + // File menu + EVT_MENU_RANGE(ID_BOOK_NOTEBOOK, ID_BOOK_MAX, MyFrame::OnType) + EVT_MENU_RANGE(ID_ORIENT_DEFAULT, ID_ORIENT_MAX, MyFrame::OnOrient) + EVT_MENU(ID_SHOW_IMAGES, MyFrame::OnShowImages) + EVT_MENU(ID_MULTI, MyFrame::OnMulti) + EVT_MENU(wxID_EXIT, MyFrame::OnExit) + + // Operations menu + EVT_MENU(ID_ADD_PAGE, MyFrame::OnAddPage) + EVT_MENU(ID_ADD_PAGE_NO_SELECT, MyFrame::OnAddPageNoSelect) + EVT_MENU(ID_INSERT_PAGE, MyFrame::OnInsertPage) + EVT_MENU(ID_DELETE_CUR_PAGE, MyFrame::OnDeleteCurPage) + EVT_MENU(ID_DELETE_LAST_PAGE, MyFrame::OnDeleteLastPage) + EVT_MENU(ID_NEXT_PAGE, MyFrame::OnNextPage) + EVT_MENU(ID_GO_HOME, MyFrame::OnGoHome) + +#if wxUSE_HELP + EVT_MENU(ID_CONTEXT_HELP, MyFrame::OnContextHelp) +#endif // wxUSE_HELP + EVT_MENU(ID_HITTEST, MyFrame::OnHitTest) + + // Book controls +#if wxUSE_NOTEBOOK + EVT_NOTEBOOK_PAGE_CHANGED(wxID_ANY, MyFrame::OnNotebook) + EVT_NOTEBOOK_PAGE_CHANGING(wxID_ANY, MyFrame::OnNotebook) +#endif +#if wxUSE_LISTBOOK + EVT_LISTBOOK_PAGE_CHANGED(wxID_ANY, MyFrame::OnListbook) + EVT_LISTBOOK_PAGE_CHANGING(wxID_ANY, MyFrame::OnListbook) +#endif +#if wxUSE_CHOICEBOOK + EVT_CHOICEBOOK_PAGE_CHANGED(wxID_ANY, MyFrame::OnChoicebook) + EVT_CHOICEBOOK_PAGE_CHANGING(wxID_ANY, MyFrame::OnChoicebook) +#endif +#if wxUSE_TREEBOOK + EVT_TREEBOOK_PAGE_CHANGED(wxID_ANY, MyFrame::OnTreebook) + EVT_TREEBOOK_PAGE_CHANGING(wxID_ANY, MyFrame::OnTreebook) + + EVT_MENU(ID_ADD_SUB_PAGE, MyFrame::OnAddSubPage) + EVT_MENU(ID_ADD_PAGE_BEFORE, MyFrame::OnAddPageBefore) + EVT_UPDATE_UI_RANGE(ID_ADD_PAGE_BEFORE, ID_ADD_SUB_PAGE, + MyFrame::OnUpdateTreeMenu) +#endif +#if wxUSE_TOOLBOOK + EVT_TOOLBOOK_PAGE_CHANGED(wxID_ANY, MyFrame::OnToolbook) + EVT_TOOLBOOK_PAGE_CHANGING(wxID_ANY, MyFrame::OnToolbook) +#endif + + // Update title in idle time + EVT_IDLE(MyFrame::OnIdle) +END_EVENT_TABLE() + MyFrame::MyFrame() - : 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 @@ -211,6 +315,9 @@ MyFrame::MyFrame() #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); @@ -221,17 +328,26 @@ MyFrame::MyFrame() 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")); + 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 - 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 + menuPageOperations->AppendSeparator(); + menuPageOperations->Append(ID_GO_HOME, wxT("Go to the first page\tCtrl-F")); + + 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")); @@ -245,6 +361,7 @@ MyFrame::MyFrame() wxMenuBar *menuBar = new wxMenuBar; menuBar->Append(menuFile, wxT("&File")); + menuBar->Append(menuPageOperations, wxT("&Pages")); menuBar->Append(menuOperations, wxT("&Operations")); SetMenuBar(menuBar); @@ -286,7 +403,6 @@ MyFrame::MyFrame() m_panel->SetSizer(m_sizerFrame); - m_sizerFrame->Fit(this); m_sizerFrame->SetSizeHints(this); Centre(wxBOTH); @@ -329,23 +445,30 @@ MyFrame::~MyFrame() #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) \ 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") ); \ + 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; - DISPATCH_ON_TYPE(flag =, nb, lb, chb, tbk, + 0); + DISPATCH_ON_TYPE(flag =, nb, lb, chb, tbk, toolbk, + 0); return flag; } @@ -377,7 +500,6 @@ void MyFrame::RecreateBook() if ( m_multi && m_type == Type_Notebook ) flags |= wxNB_MULTILINE; - flags |= wxDOUBLE_BORDER; wxBookCtrlBase *oldBook = m_bookCtrl; @@ -388,6 +510,7 @@ void MyFrame::RecreateBook() wxListbook, wxChoicebook, wxTreebook, + wxToolbook, (m_panel, wxID_ANY, wxDefaultPosition, wxDefaultSize, flags)); if ( !m_bookCtrl ) @@ -425,7 +548,7 @@ void MyFrame::RecreateBook() 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; @@ -455,51 +578,71 @@ void MyFrame::RecreateBook() 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) +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) +#if wxUSE_HELP + panel->SetHelpText( wxT( "Panel with \"First\" and \"Second\" buttons" ) ); #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 + (void) new wxButton(panel, wxID_ANY, wxT("First button"), wxPoint(10, 30)); + (void) new wxButton(panel, wxID_ANY, wxT("Second button"), wxPoint(150, 30)); - // Update title in idle time - EVT_IDLE(MyFrame::OnIdle) -END_EVENT_TABLE() + return panel; +} + + +//----------------------------------------------------------------------------- +// MyFrame - event handlers +//----------------------------------------------------------------------------- + +#if wxUSE_HELP + +void MyFrame::OnContextHelp(wxCommandEvent& WXUNUSED(event)) +{ + // launches local event loop + wxContextHelp ch( this ); +} + +#endif // wxUSE_HELP + +void MyFrame::OnHitTest(wxCommandEvent& WXUNUSED(event)) +{ + wxBookCtrlBase * book = GetCurrentBook(); + 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) { - m_type = wx_static_cast(BookType, event.GetId() - ID_BOOK_NOTEBOOK); + m_type = static_cast(event.GetId() - ID_BOOK_NOTEBOOK); if ( m_bookCtrl ) m_sizerFrame->Hide(m_bookCtrl); @@ -516,7 +659,6 @@ void MyFrame::OnUpdateTreeMenu(wxUpdateUIEvent& event) #endif // wxUSE_TREEBOOK - void MyFrame::OnOrient(wxCommandEvent& event) { m_orient = event.GetId(); @@ -536,7 +678,7 @@ void MyFrame::OnMulti(wxCommandEvent& event) m_multi = event.IsChecked(); RecreateBook(); m_sizerFrame->Layout(); - wxLogMessage(_T("Multiline setting works only in wxNotebook.")); + wxLogMessage(wxT("Multiline setting works only in wxNotebook.")); } void MyFrame::OnExit(wxCommandEvent& WXUNUSED(event)) @@ -544,16 +686,25 @@ void MyFrame::OnExit(wxCommandEvent& WXUNUSED(event)) 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(); @@ -566,7 +717,7 @@ void MyFrame::OnAddPage(wxCommandEvent& WXUNUSED(event)) ADDED_PAGE_NAME wxT("%u"), ++s_pageAdded ), - true, + false, GetIconIndex(currBook)); } } @@ -580,20 +731,23 @@ void MyFrame::OnAddSubPage(wxCommandEvent& WXUNUSED(event)) 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; - 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) + ); } } @@ -605,7 +759,7 @@ void MyFrame::OnAddPageBefore(wxCommandEvent& WXUNUSED(event)) const int selPos = currBook->GetSelection(); if ( selPos == wxNOT_FOUND ) { - wxLogError(_T("Select the parent page first!")); + wxLogError(wxT("Select the parent page first!")); return; } @@ -681,6 +835,18 @@ void MyFrame::OnNextPage(wxCommandEvent& WXUNUSED(event)) } } +void MyFrame::OnGoHome(wxCommandEvent& WXUNUSED(event)) +{ + wxBookCtrlBase *currBook = GetCurrentBook(); + + if ( currBook ) + { + // ChangeSelection shouldn't send any events, SetSelection() should + currBook->ChangeSelection(0); + //currBook->SetSelection(0); + } +} + void MyFrame::OnIdle( wxIdleEvent& WXUNUSED(event) ) { static int s_nPages = wxNOT_FOUND; @@ -724,30 +890,37 @@ void MyFrame::OnBookCtrl(wxBookCtrlBaseEvent& event) { wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGED, wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGING, - _T("wxNotebook") + wxT("wxNotebook") }, #endif // wxUSE_NOTEBOOK #if wxUSE_LISTBOOK { wxEVT_COMMAND_LISTBOOK_PAGE_CHANGED, wxEVT_COMMAND_LISTBOOK_PAGE_CHANGING, - _T("wxListbook") + wxT("wxListbook") }, #endif // wxUSE_LISTBOOK #if wxUSE_CHOICEBOOK { wxEVT_COMMAND_CHOICEBOOK_PAGE_CHANGED, wxEVT_COMMAND_CHOICEBOOK_PAGE_CHANGING, - _T("wxChoicebook") + wxT("wxChoicebook") }, #endif // wxUSE_CHOICEBOOK #if wxUSE_TREEBOOK { wxEVT_COMMAND_TREEBOOK_PAGE_CHANGED, wxEVT_COMMAND_TREEBOOK_PAGE_CHANGING, - _T("wxTreebook") + wxT("wxTreebook") }, #endif // wxUSE_TREEBOOK +#if wxUSE_TOOLBOOK + { + wxEVT_COMMAND_TOOLBOOK_PAGE_CHANGED, + wxEVT_COMMAND_TOOLBOOK_PAGE_CHANGING, + wxT("wxToolbook") + }, +#endif // wxUSE_TOOLBOOK }; @@ -769,7 +942,7 @@ void MyFrame::OnBookCtrl(wxBookCtrlBaseEvent& event) // NB: can't use wxStaticCast here as wxBookCtrlBase is not in // wxRTTI const wxBookCtrlBase * const - book = wx_static_cast(wxBookCtrlBase *, event.GetEventObject()); + book = static_cast(event.GetEventObject()); if ( idx != wxNOT_FOUND && book && book->GetPageText(idx) == VETO_PAGE_NAME ) { @@ -783,7 +956,7 @@ void MyFrame::OnBookCtrl(wxBookCtrlBaseEvent& event) ) != wxYES ) { event.Veto(); - veto = _T(" (vetoed)"); + veto = wxT(" (vetoed)"); } }