X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/a7dbf7c8bc2b040ad4ac88c1fd19e878ebaefdf2..1dc39a1fb565cbdc90f8537599551a3556efce8a:/samples/notebook/notebook.cpp diff --git a/samples/notebook/notebook.cpp b/samples/notebook/notebook.cpp index 62dcd75b0a..31d2067898 100644 --- a/samples/notebook/notebook.cpp +++ b/samples/notebook/notebook.cpp @@ -30,6 +30,10 @@ #include "../sample.xpm" #endif +//----------------------------------------------------------------------------- +// MyApp +//----------------------------------------------------------------------------- + IMPLEMENT_APP(MyApp) bool MyApp::OnInit() @@ -43,6 +47,7 @@ bool MyApp::OnInit() // 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 @@ -57,6 +62,11 @@ bool MyApp::OnInit() return true; } + +//----------------------------------------------------------------------------- +// Creation functions +//----------------------------------------------------------------------------- + wxPanel *CreateUserCreatedPage(wxBookCtrlBase *parent) { wxPanel *panel = new wxPanel(parent); @@ -66,7 +76,7 @@ wxPanel *CreateUserCreatedPage(wxBookCtrlBase *parent) #endif (void) new wxButton( panel, wxID_ANY, wxT("Button"), - wxPoint(10, 10), wxDefaultSize ); + wxPoint(10, 10), wxDefaultSize ); return panel; } @@ -79,13 +89,15 @@ wxPanel *CreateRadioButtonsPage(wxBookCtrlBase *parent) panel->SetHelpText( wxT( "Panel with some Radio Buttons" ) ); #endif - wxString animals[] = { wxT("Fox"), wxT("Hare"), wxT("Rabbit"), + 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, @@ -109,7 +121,8 @@ wxPanel *CreateVetoPage(wxBookCtrlBase *parent) #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; } @@ -131,7 +144,6 @@ wxPanel *CreateBigButtonPage(wxBookCtrlBase *parent) return panel; } - wxPanel *CreateInsertPage(wxBookCtrlBase *parent) { wxPanel *panel = new wxPanel(parent); @@ -142,7 +154,8 @@ wxPanel *CreateInsertPage(wxBookCtrlBase *parent) 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; } @@ -200,11 +213,69 @@ 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"))) { @@ -332,7 +403,6 @@ MyFrame::MyFrame() m_panel->SetSizer(m_sizerFrame); - m_sizerFrame->Fit(this); m_sizerFrame->SetSizeHints(this); Centre(wxBOTH); @@ -381,17 +451,17 @@ MyFrame::~MyFrame() #define CASE_TOOLBOOK(x) #endif -#define DISPATCH_ON_TYPE(before, nb, lb, cb, tb, toolb, after) \ +#define DISPATCH_ON_TYPE(before, nb, lb, cb, tb, toolb, after) \ switch ( m_type ) \ { \ CASE_NOTEBOOK(before nb after) \ CASE_LISTBOOK(before lb after) \ CASE_CHOICEBOOK(before cb after) \ CASE_TREEBOOK(before tb after) \ - CASE_TOOLBOOK(before toolb 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, int toolbk) const @@ -508,58 +578,35 @@ 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_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) +wxPanel *MyFrame::CreateNewPage() const +{ + wxPanel *panel = new wxPanel(m_bookCtrl, wxID_ANY ); #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) + panel->SetHelpText( wxT( "Panel with \"First\" and \"Second\" buttons" ) ); #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 + (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 @@ -571,16 +618,6 @@ void MyFrame::OnContextHelp(wxCommandEvent& WXUNUSED(event)) #endif // wxUSE_HELP -void MyFrame::AddFlagStrIfFlagPresent(wxString & flagStr, long flags, long flag, const wxChar * flagName) const -{ - if( (flags & flag) == flag ) - { - if( !flagStr.empty() ) - flagStr += _T(" | "); - flagStr += flagName; - } -} - void MyFrame::OnHitTest(wxCommandEvent& WXUNUSED(event)) { wxBookCtrlBase * book = GetCurrentBook(); @@ -591,10 +628,10 @@ void MyFrame::OnHitTest(wxCommandEvent& WXUNUSED(event)) wxString flagsStr; - AddFlagStrIfFlagPresent( flagsStr, flags, wxBK_HITTEST_NOWHERE, _T("wxBK_HITTEST_NOWHERE") ); - AddFlagStrIfFlagPresent( flagsStr, flags, wxBK_HITTEST_ONICON, _T("wxBK_HITTEST_ONICON") ); - AddFlagStrIfFlagPresent( flagsStr, flags, wxBK_HITTEST_ONLABEL, _T("wxBK_HITTEST_ONLABEL") ); - AddFlagStrIfFlagPresent( flagsStr, flags, wxBK_HITTEST_ONPAGE, _T("wxBK_HITTEST_ONPAGE") ); + 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, @@ -605,7 +642,7 @@ void MyFrame::OnHitTest(wxCommandEvent& WXUNUSED(event)) 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); @@ -622,7 +659,6 @@ void MyFrame::OnUpdateTreeMenu(wxUpdateUIEvent& event) #endif // wxUSE_TREEBOOK - void MyFrame::OnOrient(wxCommandEvent& event) { m_orient = event.GetId(); @@ -642,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)) @@ -650,20 +686,6 @@ void MyFrame::OnExit(wxCommandEvent& WXUNUSED(event)) Close(); } -wxPanel *MyFrame::CreateNewPage() const -{ - wxPanel *panel = new wxPanel(m_bookCtrl, wxID_ANY ); - -#if wxUSE_HELP - panel->SetHelpText( wxT( "Panel with \"First\" and \"Second\" buttons" ) ); -#endif - - (void) new wxButton(panel, wxID_ANY, wxT("First button"), wxPoint(10, 10)); - (void) new wxButton(panel, wxID_ANY, wxT("Second button"), wxPoint(50, 100)); - - return panel; -} - void MyFrame::OnAddPage(wxCommandEvent& WXUNUSED(event)) { wxBookCtrlBase *currBook = GetCurrentBook(); @@ -709,7 +731,7 @@ 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; } @@ -737,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; } @@ -868,35 +890,35 @@ 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, - _T("wxToolbook") + wxT("wxToolbook") }, #endif // wxUSE_TOOLBOOK }; @@ -920,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 ) { @@ -934,7 +956,7 @@ void MyFrame::OnBookCtrl(wxBookCtrlBaseEvent& event) ) != wxYES ) { event.Veto(); - veto = _T(" (vetoed)"); + veto = wxT(" (vetoed)"); } }