X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/f2fdc4d56e41711ce7c547484bf97aa0c2bd997a..d8eff331e23435d9d8d6483a40f6fd9997a13f87:/samples/widgets/notebook.cpp diff --git a/samples/widgets/notebook.cpp b/samples/widgets/notebook.cpp index f65f461179..ded5de3900 100644 --- a/samples/widgets/notebook.cpp +++ b/samples/widgets/notebook.cpp @@ -44,6 +44,7 @@ #include "wx/sizer.h" #include "wx/bookctrl.h" #include "wx/artprov.h" +#include "wx/imaglist.h" #include "widgets.h" @@ -85,19 +86,17 @@ enum Orient class BookWidgetsPage : public WidgetsPage { public: - BookWidgetsPage(WidgetsBookCtrl *book); + BookWidgetsPage(WidgetsBookCtrl *book, wxImageList *imaglist, const char *const icon[]); virtual ~BookWidgetsPage(); virtual wxControl *GetWidget() const { return m_book; } virtual void RecreateWidget() { RecreateBook(); } + // lazy creation of the content + virtual void CreateContent(); + protected: // event handlers -#ifdef ABX - void OnPageChanging(wxNotebookEvent& event); - void OnPageChanged(wxNotebookEvent& event); -#endif - void OnButtonReset(wxCommandEvent& event); void OnButtonDeleteAll(wxCommandEvent& event); void OnButtonSelectPage(wxCommandEvent& event); @@ -123,8 +122,10 @@ protected: void RecreateBook(); virtual wxBookCtrlBase *CreateBook(long flags) = 0; +#if USE_ICONS_IN_BOOK // create or destroy the image list void CreateImageList(); +#endif // USE_ICONS_IN_BOOK // create a new page wxWindow *CreateNewPage(); @@ -155,8 +156,10 @@ protected: wxBookCtrlBase *m_book; wxSizer *m_sizerBook; - // thei mage list for our book +#if USE_ICONS_IN_BOOK + // the image list for our book wxImageList *m_imageList; +#endif // USE_ICONS_IN_BOOK private: DECLARE_EVENT_TABLE() @@ -181,11 +184,6 @@ BEGIN_EVENT_TABLE(BookWidgetsPage, WidgetsPage) EVT_UPDATE_UI(BookPage_InsertPage, BookWidgetsPage::OnUpdateUIInsertButton) EVT_UPDATE_UI(BookPage_RemovePage, BookWidgetsPage::OnUpdateUIRemoveButton) -#ifdef ABX - EVT_NOTEBOOK_PAGE_CHANGING(wxID_ANY, BookWidgetsPage::OnPageChanging) - EVT_NOTEBOOK_PAGE_CHANGED(wxID_ANY, NotebookWidgetsPage::OnPageChanged) -#endif - EVT_CHECKBOX(wxID_ANY, BookWidgetsPage::OnCheckOrRadioBox) EVT_RADIOBOX(wxID_ANY, BookWidgetsPage::OnCheckOrRadioBox) END_EVENT_TABLE() @@ -194,33 +192,39 @@ END_EVENT_TABLE() // implementation // ============================================================================ -BookWidgetsPage::BookWidgetsPage(WidgetsBookCtrl *book) - :WidgetsPage(book) +BookWidgetsPage::BookWidgetsPage(WidgetsBookCtrl *book, wxImageList *imaglist, const char *const icon[]) + :WidgetsPage(book, imaglist, icon) { // init everything m_chkImages = NULL; +#if USE_ICONS_IN_BOOK m_imageList = NULL; +#endif // USE_ICONS_IN_BOOK m_book = NULL; + m_radioOrient = NULL; m_sizerBook = (wxSizer *)NULL; +} +void BookWidgetsPage::CreateContent() +{ wxSizer *sizerTop = new wxBoxSizer(wxHORIZONTAL); // left pane - wxStaticBox *box = new wxStaticBox(this, wxID_ANY, _T("&Set style")); + wxStaticBox *box = new wxStaticBox(this, wxID_ANY, wxT("&Set style")); // must be in sync with Orient enum wxArrayString orientations; - orientations.Add(_T("&top")); - orientations.Add(_T("&bottom")); - orientations.Add(_T("&left")); - orientations.Add(_T("&right")); + orientations.Add(wxT("&top")); + orientations.Add(wxT("&bottom")); + orientations.Add(wxT("&left")); + orientations.Add(wxT("&right")); wxASSERT_MSG( orientations.GetCount() == Orient_Max, - _T("forgot to update something") ); + wxT("forgot to update something") ); - m_chkImages = new wxCheckBox(this, wxID_ANY, _T("Show &images")); - m_radioOrient = new wxRadioBox(this, wxID_ANY, _T("&Tab orientation"), + m_chkImages = new wxCheckBox(this, wxID_ANY, wxT("Show &images")); + m_radioOrient = new wxRadioBox(this, wxID_ANY, wxT("&Tab orientation"), wxDefaultPosition, wxDefaultSize, orientations, 1, wxRA_SPECIFY_COLS); @@ -230,48 +234,48 @@ BookWidgetsPage::BookWidgetsPage(WidgetsBookCtrl *book) sizerLeft->Add(5, 5, 0, wxGROW | wxALL, 5); // spacer sizerLeft->Add(m_radioOrient, 0, wxALL, 5); - wxButton *btn = new wxButton(this, BookPage_Reset, _T("&Reset")); + wxButton *btn = new wxButton(this, BookPage_Reset, wxT("&Reset")); sizerLeft->Add(btn, 0, wxALIGN_CENTRE_HORIZONTAL | wxALL, 15); // middle pane - wxStaticBox *box2 = new wxStaticBox(this, wxID_ANY, _T("&Contents")); + wxStaticBox *box2 = new wxStaticBox(this, wxID_ANY, wxT("&Contents")); wxSizer *sizerMiddle = new wxStaticBoxSizer(box2, wxVERTICAL); wxTextCtrl *text; - wxSizer *sizerRow = CreateSizerWithTextAndLabel(_T("Number of pages: "), + wxSizer *sizerRow = CreateSizerWithTextAndLabel(wxT("Number of pages: "), BookPage_NumPagesText, &text); text->SetEditable(false); sizerMiddle->Add(sizerRow, 0, wxALL | wxGROW, 5); - sizerRow = CreateSizerWithTextAndLabel(_T("Current selection: "), + sizerRow = CreateSizerWithTextAndLabel(wxT("Current selection: "), BookPage_CurSelectText, &text); text->SetEditable(false); sizerMiddle->Add(sizerRow, 0, wxALL | wxGROW, 5); sizerRow = CreateSizerWithTextAndButton(BookPage_SelectPage, - _T("&Select page"), + wxT("&Select page"), BookPage_SelectText, &m_textSelect); sizerMiddle->Add(sizerRow, 0, wxALL | wxGROW, 5); - btn = new wxButton(this, BookPage_AddPage, _T("&Add page")); + btn = new wxButton(this, BookPage_AddPage, wxT("&Add page")); sizerMiddle->Add(btn, 0, wxALL | wxGROW, 5); sizerRow = CreateSizerWithTextAndButton(BookPage_InsertPage, - _T("&Insert page at"), + wxT("&Insert page at"), BookPage_InsertText, &m_textInsert); sizerMiddle->Add(sizerRow, 0, wxALL | wxGROW, 5); sizerRow = CreateSizerWithTextAndButton(BookPage_RemovePage, - _T("&Remove page"), + wxT("&Remove page"), BookPage_RemoveText, &m_textRemove); sizerMiddle->Add(sizerRow, 0, wxALL | wxGROW, 5); - btn = new wxButton(this, BookPage_DeleteAll, _T("&Delete All")); + btn = new wxButton(this, BookPage_DeleteAll, wxT("&Delete All")); sizerMiddle->Add(btn, 0, wxALL | wxGROW, 5); // right pane @@ -282,18 +286,22 @@ BookWidgetsPage::BookWidgetsPage(WidgetsBookCtrl *book) sizerTop->Add(sizerMiddle, 0, wxGROW | wxALL, 10); sizerTop->Add(m_sizerBook, 1, wxGROW | (wxALL & ~wxRIGHT), 10); + RecreateBook(); + // final initializations Reset(); +#if USE_ICONS_IN_BOOK CreateImageList(); +#endif // USE_ICONS_IN_BOOK SetSizer(sizerTop); - - sizerTop->Fit(this); } BookWidgetsPage::~BookWidgetsPage() { +#if USE_ICONS_IN_BOOK delete m_imageList; +#endif // USE_ICONS_IN_BOOK } // ---------------------------------------------------------------------------- @@ -306,6 +314,7 @@ void BookWidgetsPage::Reset() m_radioOrient->SetSelection(Orient_Top); } +#if USE_ICONS_IN_BOOK void BookWidgetsPage::CreateImageList() { if ( m_chkImages->GetValue() ) @@ -337,14 +346,20 @@ void BookWidgetsPage::CreateImageList() // it would be logical if this removed the image list from book, under // MSW it crashes instead - FIXME } +#endif // USE_ICONS_IN_BOOK void BookWidgetsPage::RecreateBook() { + // do not recreate anything in case page content was not prepared yet + if(!m_radioOrient) + return; + int flags = ms_defaultFlags; + switch ( m_radioOrient->GetSelection() ) { default: - wxFAIL_MSG( _T("unknown orientation") ); + wxFAIL_MSG( wxT("unknown orientation") ); // fall through case Orient_Top: @@ -368,7 +383,9 @@ void BookWidgetsPage::RecreateBook() m_book = CreateBook(flags); +#if USE_ICONS_IN_BOOK CreateImageList(); +#endif // USE_ICONS_IN_BOOK if ( oldBook ) { @@ -407,8 +424,9 @@ void BookWidgetsPage::RecreateBook() int BookWidgetsPage::GetTextValue(wxTextCtrl *text) const { - long pos; - if ( !text->GetValue().ToLong(&pos) ) + long pos = -1; + + if ( !text || !text->GetValue().ToLong(&pos) ) pos = -1; return (int)pos; @@ -416,6 +434,7 @@ int BookWidgetsPage::GetTextValue(wxTextCtrl *text) const int BookWidgetsPage::GetIconIndex() const { +#if USE_ICONS_IN_BOOK if ( m_imageList ) { int nImages = m_imageList->GetImageCount(); @@ -424,13 +443,14 @@ int BookWidgetsPage::GetIconIndex() const return m_book->GetPageCount() % nImages; } } +#endif // USE_ICONS_IN_BOOK return -1; } wxWindow *BookWidgetsPage::CreateNewPage() { - return new wxTextCtrl(m_book, wxID_ANY, _T("I'm a book page")); + return new wxTextCtrl(m_book, wxID_ANY, wxT("I'm a book page")); } // ---------------------------------------------------------------------------- @@ -452,30 +472,30 @@ void BookWidgetsPage::OnButtonDeleteAll(wxCommandEvent& WXUNUSED(event)) void BookWidgetsPage::OnButtonSelectPage(wxCommandEvent& WXUNUSED(event)) { int pos = GetTextValue(m_textSelect); - wxCHECK_RET( IsValidValue(pos), _T("button should be disabled") ); + wxCHECK_RET( IsValidValue(pos), wxT("button should be disabled") ); m_book->SetSelection(pos); } void BookWidgetsPage::OnButtonAddPage(wxCommandEvent& WXUNUSED(event)) { - m_book->AddPage(CreateNewPage(), _T("Added page"), false, + m_book->AddPage(CreateNewPage(), wxT("Added page"), false, GetIconIndex()); } void BookWidgetsPage::OnButtonInsertPage(wxCommandEvent& WXUNUSED(event)) { int pos = GetTextValue(m_textInsert); - wxCHECK_RET( IsValidValue(pos), _T("button should be disabled") ); + wxCHECK_RET( IsValidValue(pos), wxT("button should be disabled") ); - m_book->InsertPage(pos, CreateNewPage(), _T("Inserted page"), false, + m_book->InsertPage(pos, CreateNewPage(), wxT("Inserted page"), false, GetIconIndex()); } void BookWidgetsPage::OnButtonRemovePage(wxCommandEvent& WXUNUSED(event)) { int pos = GetTextValue(m_textRemove); - wxCHECK_RET( IsValidValue(pos), _T("button should be disabled") ); + wxCHECK_RET( IsValidValue(pos), wxT("button should be disabled") ); m_book->DeletePage(pos); } @@ -497,18 +517,21 @@ void BookWidgetsPage::OnUpdateUIRemoveButton(wxUpdateUIEvent& event) void BookWidgetsPage::OnUpdateUIResetButton(wxUpdateUIEvent& event) { - event.Enable( !m_chkImages->GetValue() || - m_radioOrient->GetSelection() != wxBK_TOP ); + if(m_chkImages && m_radioOrient) + event.Enable( !m_chkImages->GetValue() || + m_radioOrient->GetSelection() != wxBK_TOP ); } void BookWidgetsPage::OnUpdateUINumPagesText(wxUpdateUIEvent& event) { - event.SetText( wxString::Format(_T("%d"), m_book->GetPageCount()) ); + if(m_book) + event.SetText( wxString::Format(wxT("%u"), unsigned(m_book->GetPageCount())) ); } void BookWidgetsPage::OnUpdateUICurSelectText(wxUpdateUIEvent& event) { - event.SetText( wxString::Format(_T("%d"), m_book->GetSelection()) ); + if(m_book) + event.SetText( wxString::Format(wxT("%d"), m_book->GetSelection()) ); } void BookWidgetsPage::OnCheckOrRadioBox(wxCommandEvent& WXUNUSED(event)) @@ -516,29 +539,6 @@ void BookWidgetsPage::OnCheckOrRadioBox(wxCommandEvent& WXUNUSED(event)) RecreateBook(); } -#ifdef ABX -void BookWidgetsPage::OnPageChanging(wxBookEvent& event) -{ - wxLogMessage(_T("Notebook page changing from %d to %d (currently %d)."), - event.GetOldSelection(), - event.GetSelection(), - m_notebook->GetSelection()); - - event.Skip(); -} - -void NotebookWidgetsPage::OnPageChanged(wxNotebookEvent& event) -{ - wxLogMessage(_T("Notebook page changed from %d to %d (currently %d)."), - event.GetOldSelection(), - event.GetSelection(), - m_notebook->GetSelection()); - - event.Skip(); -} - -#endif - #if wxUSE_NOTEBOOK #include "icons/notebook.xpm" @@ -552,22 +552,24 @@ class NotebookWidgetsPage : public BookWidgetsPage { public: NotebookWidgetsPage(WidgetsBookCtrl *book, wxImageList *imaglist) - : BookWidgetsPage(book) + : BookWidgetsPage(book, imaglist, notebook_xpm) { - imaglist->Add(wxBitmap(notebook_xpm)); RecreateBook(); } virtual ~NotebookWidgetsPage() {} protected: + // event handlers + void OnPageChanging(wxNotebookEvent& event); + void OnPageChanged(wxNotebookEvent& event); + // (re)create book virtual wxBookCtrlBase *CreateBook(long flags) { return new wxNotebook(this, BookPage_Book, wxDefaultPosition, wxDefaultSize, flags); - } private: @@ -580,14 +582,42 @@ private: // ---------------------------------------------------------------------------- BEGIN_EVENT_TABLE(NotebookWidgetsPage, BookWidgetsPage) + EVT_NOTEBOOK_PAGE_CHANGING(wxID_ANY, NotebookWidgetsPage::OnPageChanging) + EVT_NOTEBOOK_PAGE_CHANGED(wxID_ANY, NotebookWidgetsPage::OnPageChanged) END_EVENT_TABLE() -IMPLEMENT_WIDGETS_PAGE(NotebookWidgetsPage, _T("Notebook"), - (int)wxPlatform(GENERIC_CTRLS).If(wxMSW,NATIVE_CTRLS) - .ElseIf(wxGTK,NATIVE_CTRLS) - | BOOK_CTRLS +#if defined(__WXUNIVERSAL__) + #define FAMILY_CTRLS UNIVERSAL_CTRLS +#elif defined(__WXMOTIF__) + #define FAMILY_CTRLS GENERIC_CTRLS +#else + #define FAMILY_CTRLS NATIVE_CTRLS +#endif + +IMPLEMENT_WIDGETS_PAGE(NotebookWidgetsPage, wxT("Notebook"), + FAMILY_CTRLS | BOOK_CTRLS ); +void NotebookWidgetsPage::OnPageChanging(wxNotebookEvent& event) +{ + wxLogMessage(wxT("Notebook page changing from %d to %d (currently %d)."), + event.GetOldSelection(), + event.GetSelection(), + m_book->GetSelection()); + + event.Skip(); +} + +void NotebookWidgetsPage::OnPageChanged(wxNotebookEvent& event) +{ + wxLogMessage(wxT("Notebook page changed from %d to %d (currently %d)."), + event.GetOldSelection(), + event.GetSelection(), + m_book->GetSelection()); + + event.Skip(); +} + #endif // wxUSE_NOTEBOOK #if wxUSE_LISTBOOK @@ -603,22 +633,24 @@ class ListbookWidgetsPage : public BookWidgetsPage { public: ListbookWidgetsPage(WidgetsBookCtrl *book, wxImageList *imaglist) - : BookWidgetsPage(book) + : BookWidgetsPage(book, imaglist, listbook_xpm) { - imaglist->Add(wxBitmap(listbook_xpm)); RecreateBook(); } virtual ~ListbookWidgetsPage() {} protected: + // event handlers + void OnPageChanging(wxListbookEvent& event); + void OnPageChanged(wxListbookEvent& event); + // (re)create book virtual wxBookCtrlBase *CreateBook(long flags) { return new wxListbook(this, BookPage_Book, wxDefaultPosition, wxDefaultSize, flags); - } private: @@ -631,12 +663,34 @@ private: // ---------------------------------------------------------------------------- BEGIN_EVENT_TABLE(ListbookWidgetsPage, BookWidgetsPage) + EVT_LISTBOOK_PAGE_CHANGING(wxID_ANY, ListbookWidgetsPage::OnPageChanging) + EVT_LISTBOOK_PAGE_CHANGED(wxID_ANY, ListbookWidgetsPage::OnPageChanged) END_EVENT_TABLE() -IMPLEMENT_WIDGETS_PAGE(ListbookWidgetsPage, _T("Listbook"), +IMPLEMENT_WIDGETS_PAGE(ListbookWidgetsPage, wxT("Listbook"), GENERIC_CTRLS | BOOK_CTRLS ); +void ListbookWidgetsPage::OnPageChanging(wxListbookEvent& event) +{ + wxLogMessage(wxT("Listbook page changing from %d to %d (currently %d)."), + event.GetOldSelection(), + event.GetSelection(), + m_book->GetSelection()); + + event.Skip(); +} + +void ListbookWidgetsPage::OnPageChanged(wxListbookEvent& event) +{ + wxLogMessage(wxT("Listbook page changed from %d to %d (currently %d)."), + event.GetOldSelection(), + event.GetSelection(), + m_book->GetSelection()); + + event.Skip(); +} + #endif // wxUSE_LISTBOOK #if wxUSE_CHOICEBOOK @@ -652,22 +706,24 @@ class ChoicebookWidgetsPage : public BookWidgetsPage { public: ChoicebookWidgetsPage(WidgetsBookCtrl *book, wxImageList *imaglist) - : BookWidgetsPage(book) + : BookWidgetsPage(book, imaglist, choicebk_xpm) { - imaglist->Add(wxBitmap(choicebk_xpm)); RecreateBook(); } virtual ~ChoicebookWidgetsPage() {} protected: + // event handlers + void OnPageChanging(wxChoicebookEvent& event); + void OnPageChanged(wxChoicebookEvent& event); + // (re)create book virtual wxBookCtrlBase *CreateBook(long flags) { return new wxChoicebook(this, BookPage_Book, wxDefaultPosition, wxDefaultSize, flags); - } private: @@ -680,12 +736,34 @@ private: // ---------------------------------------------------------------------------- BEGIN_EVENT_TABLE(ChoicebookWidgetsPage, BookWidgetsPage) + EVT_CHOICEBOOK_PAGE_CHANGING(wxID_ANY, ChoicebookWidgetsPage::OnPageChanging) + EVT_CHOICEBOOK_PAGE_CHANGED(wxID_ANY, ChoicebookWidgetsPage::OnPageChanged) END_EVENT_TABLE() -IMPLEMENT_WIDGETS_PAGE(ChoicebookWidgetsPage, _T("Choicebook"), +IMPLEMENT_WIDGETS_PAGE(ChoicebookWidgetsPage, wxT("Choicebook"), GENERIC_CTRLS | BOOK_CTRLS ); +void ChoicebookWidgetsPage::OnPageChanging(wxChoicebookEvent& event) +{ + wxLogMessage(wxT("Choicebook page changing from %d to %d (currently %d)."), + event.GetOldSelection(), + event.GetSelection(), + m_book->GetSelection()); + + event.Skip(); +} + +void ChoicebookWidgetsPage::OnPageChanged(wxChoicebookEvent& event) +{ + wxLogMessage(wxT("Choicebook page changed from %d to %d (currently %d)."), + event.GetOldSelection(), + event.GetSelection(), + m_book->GetSelection()); + + event.Skip(); +} + #endif // wxUSE_CHOICEBOOK #endif // wxUSE_BOOKCTRL