X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/fab8784c715b09462d6b05dd93a3b4776cb205c9..e0dec8753abaf97e006ea1185bfb6775b28df0a8:/samples/notebook/notebook.cpp?ds=inline diff --git a/samples/notebook/notebook.cpp b/samples/notebook/notebook.cpp index 39533d2175..46da69e90f 100644 --- a/samples/notebook/notebook.cpp +++ b/samples/notebook/notebook.cpp @@ -26,7 +26,7 @@ #include "wx/utils.h" #include "notebook.h" -#if !defined(__WXMSW__) && !defined(__WXPM__) +#ifndef wxHAS_IMAGES_IN_RESOURCES #include "../sample.xpm" #endif @@ -47,7 +47,6 @@ 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 @@ -228,7 +227,7 @@ BEGIN_EVENT_TABLE(MyFrame, wxFrame) 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_RANGE(ID_FIXEDWIDTH, ID_HORZ_LAYOUT, MyFrame::OnStyle) EVT_MENU(wxID_EXIT, MyFrame::OnExit) // Operations menu @@ -238,7 +237,10 @@ BEGIN_EVENT_TABLE(MyFrame, wxFrame) 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) + EVT_MENU(ID_CHANGE_SELECTION, MyFrame::OnChangeSelection) + EVT_MENU(ID_SET_SELECTION, MyFrame::OnSetSelection) + EVT_MENU(ID_GET_PAGE_SIZE, MyFrame::OnGetPageSize) + EVT_MENU(ID_SET_PAGE_SIZE, MyFrame::OnSetPageSize) #if wxUSE_HELP EVT_MENU(ID_CONTEXT_HELP, MyFrame::OnContextHelp) @@ -271,6 +273,10 @@ BEGIN_EVENT_TABLE(MyFrame, wxFrame) EVT_TOOLBOOK_PAGE_CHANGED(wxID_ANY, MyFrame::OnToolbook) EVT_TOOLBOOK_PAGE_CHANGING(wxID_ANY, MyFrame::OnToolbook) #endif +#if wxUSE_AUI + EVT_AUINOTEBOOK_PAGE_CHANGED(wxID_ANY, MyFrame::OnAuiNotebook) + EVT_AUINOTEBOOK_PAGE_CHANGING(wxID_ANY, MyFrame::OnAuiNotebook) +#endif // Update title in idle time EVT_IDLE(MyFrame::OnIdle) @@ -293,13 +299,19 @@ MyFrame::MyFrame() m_type = Type_Treebook; #elif wxUSE_TOOLBOOK m_type = Type_Toolbook; +#elif wxUSE_AUI + m_type = Type_Aui; #else - #error "Don't use Notebook sample without any book enabled in wxWidgets build!" + m_type = Type_Simplebook; #endif m_orient = ID_ORIENT_DEFAULT; m_chkShowImages = true; + m_fixedWidth = false; m_multi = false; + m_noPageTheme = false; + m_buttonBar = false; + m_horzLayout = false; SetIcon(wxICON(sample)); @@ -320,6 +332,10 @@ MyFrame::MyFrame() #if wxUSE_TOOLBOOK menuType->AppendRadioItem(ID_BOOK_TOOLBOOK, wxT("T&oolbook\tCtrl-5")); #endif +#if wxUSE_AUI + menuType->AppendRadioItem(ID_BOOK_AUINOTEBOOK, wxT("&AuiNotebook\tCtrl-6")); +#endif + menuType->AppendRadioItem(ID_BOOK_SIMPLEBOOK, "&Simple book\tCtrl-7"); menuType->Check(ID_BOOK_NOTEBOOK + m_type, true); @@ -330,6 +346,17 @@ MyFrame::MyFrame() menuOrient->AppendRadioItem(ID_ORIENT_LEFT, wxT("&Left\tAlt-3")); menuOrient->AppendRadioItem(ID_ORIENT_RIGHT, wxT("&Right\tAlt-4")); + 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")); @@ -343,7 +370,11 @@ MyFrame::MyFrame() 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")); + 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")); + menuPageOperations->AppendSeparator(); + menuPageOperations->Append(ID_GET_PAGE_SIZE, "Sho&w page size"); + menuPageOperations->Append(ID_SET_PAGE_SIZE, "Set &page size"); wxMenu *menuOperations = new wxMenu; #if wxUSE_HELP @@ -355,11 +386,10 @@ MyFrame::MyFrame() 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->Check(ID_MULTI, m_multi); wxMenuBar *menuBar = new wxMenuBar; menuBar->Append(menuFile, wxT("&File")); @@ -454,7 +484,15 @@ MyFrame::~MyFrame() #define CASE_TOOLBOOK(x) #endif -#define DISPATCH_ON_TYPE(before, nb, lb, cb, tb, toolb, after) \ +#if wxUSE_AUI + #define CASE_AUINOTEBOOK(x) case Type_AuiNotebook: x; break; +#else + #define CASE_AUINOTEBOOK(x) +#endif + +#define CASE_SIMPLEBOOK(x) case Type_Simplebook: x; break; + +#define DISPATCH_ON_TYPE(before, nb, lb, cb, tb, toolb, aui, sb, after) \ switch ( m_type ) \ { \ CASE_NOTEBOOK(before nb after) \ @@ -462,20 +500,13 @@ MyFrame::~MyFrame() CASE_CHOICEBOOK(before cb after) \ CASE_TREEBOOK(before tb after) \ CASE_TOOLBOOK(before toolb after) \ + CASE_AUINOTEBOOK(before aui after) \ + CASE_SIMPLEBOOK(before sb after) \ \ default: \ - wxFAIL_MSG( wxT("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 -{ - int flag = 0; - - DISPATCH_ON_TYPE(flag =, nb, lb, chb, tbk, toolbk, + 0); - - return flag; -} - void MyFrame::RecreateBook() { int flags; @@ -501,8 +532,20 @@ void MyFrame::RecreateBook() flags = wxBK_DEFAULT; } +#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_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; @@ -514,6 +557,8 @@ void MyFrame::RecreateBook() wxChoicebook, wxTreebook, wxToolbook, + wxAuiNotebook, + wxSimplebook, (m_panel, wxID_ANY, wxDefaultPosition, wxDefaultSize, flags)); if ( !m_bookCtrl ) @@ -521,7 +566,8 @@ void MyFrame::RecreateBook() 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); } @@ -676,12 +722,21 @@ void MyFrame::OnShowImages(wxCommandEvent& event) 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(); - wxLogMessage(wxT("Multiline setting works only in wxNotebook.")); } void MyFrame::OnExit(wxCommandEvent& WXUNUSED(event)) @@ -838,16 +893,47 @@ void MyFrame::OnNextPage(wxCommandEvent& WXUNUSED(event)) } } -void MyFrame::OnGoHome(wxCommandEvent& WXUNUSED(event)) +void MyFrame::OnChangeSelection(wxCommandEvent& WXUNUSED(event)) { wxBookCtrlBase *currBook = GetCurrentBook(); if ( currBook ) - { - // ChangeSelection shouldn't send any events, SetSelection() should currBook->ChangeSelection(0); - //currBook->SetSelection(0); - } +} + +void MyFrame::OnSetSelection(wxCommandEvent& WXUNUSED(event)) +{ + wxBookCtrlBase *currBook = GetCurrentBook(); + + if ( currBook ) + currBook->SetSelection(0); +} + +void MyFrame::OnGetPageSize(wxCommandEvent& WXUNUSED(event)) +{ + wxBookCtrlBase* const currBook = GetCurrentBook(); + if ( !currBook ) + return; + + const wxSize sizePage = currBook->GetPage(0)->GetSize(); + const wxSize sizeBook = currBook->GetSize(); + + wxLogMessage("Page size is (%d, %d), book size (%d, %d)", + sizePage.x, sizePage.y, + sizeBook.x, sizeBook.y); +} + +void MyFrame::OnSetPageSize(wxCommandEvent& WXUNUSED(event)) +{ + wxBookCtrlBase* const currBook = GetCurrentBook(); + if ( !currBook ) + return; + + const wxSize sizePage(300, 300); + currBook->SetPageSize(sizePage); + + wxLogMessage("Page size set to (%d, %d)", + sizePage.x, sizePage.y); } void MyFrame::OnIdle( wxIdleEvent& WXUNUSED(event) ) @@ -924,6 +1010,13 @@ void MyFrame::OnBookCtrl(wxBookCtrlBaseEvent& event) wxT("wxToolbook") }, #endif // wxUSE_TOOLBOOK +#if wxUSE_AUI + { + wxEVT_COMMAND_AUINOTEBOOK_PAGE_CHANGED, + wxEVT_COMMAND_AUINOTEBOOK_PAGE_CHANGING, + wxT("wxAuiNotebook") + }, +#endif // wxUSE_AUI }; @@ -931,6 +1024,12 @@ void MyFrame::OnBookCtrl(wxBookCtrlBaseEvent& event) 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(event.GetEventObject()); + for ( size_t n = 0; n < WXSIZEOF(events); n++ ) { const EventInfo& ei = events[n]; @@ -942,10 +1041,6 @@ void MyFrame::OnBookCtrl(wxBookCtrlBaseEvent& event) { const int idx = event.GetOldSelection(); - // NB: can't use wxStaticCast here as wxBookCtrlBase is not in - // wxRTTI - const wxBookCtrlBase * const - book = static_cast(event.GetEventObject()); if ( idx != wxNOT_FOUND && book && book->GetPageText(idx) == VETO_PAGE_NAME ) { @@ -976,13 +1071,14 @@ void MyFrame::OnBookCtrl(wxBookCtrlBaseEvent& event) 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(), + book->GetSelection(), veto.c_str()); #if USE_LOG