X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/e32bcef6e78f78eb8d692d50ee3f3783f350b394..728ddc45e0377352434e752ede07311e00252399:/samples/widgets/widgets.cpp diff --git a/samples/widgets/widgets.cpp b/samples/widgets/widgets.cpp index fdf3ceb1d9..7bf9ade91e 100644 --- a/samples/widgets/widgets.cpp +++ b/samples/widgets/widgets.cpp @@ -30,6 +30,7 @@ #include "wx/log.h" #include "wx/frame.h" #include "wx/menu.h" + #include "wx/image.h" #include "wx/button.h" #include "wx/checkbox.h" @@ -137,6 +138,7 @@ protected: void OnExit(wxCommandEvent& event); #if wxUSE_MENUS + void OnPageChanging(WidgetsBookCtrlEvent& event); void OnPageChanged(WidgetsBookCtrlEvent& event); void OnGoToPage(wxCommandEvent& event); @@ -156,7 +158,7 @@ protected: // initialize the book: add all pages to it void InitBook(); - // finding current page assuming book inside book + // return the currently selected page (never NULL) WidgetsPage *CurrentPage(); private: @@ -204,7 +206,7 @@ public: private: // implement sink functions - virtual void DoLog(wxLogLevel level, const wxChar *szString, time_t t) + virtual void DoLog(wxLogLevel level, const wxString& str, time_t t) { // don't put trace messages into listbox or we can get into infinite // recursion @@ -213,20 +215,20 @@ private: if ( m_logOld ) { // cast is needed to call protected method - ((LboxLogger *)m_logOld)->DoLog(level, szString, t); + ((LboxLogger *)m_logOld)->DoLog(level, str, t); } } else { - wxLog::DoLog(level, szString, t); + wxLog::DoLog(level, str, t); } } - virtual void DoLogString(const wxChar *szString, time_t WXUNUSED(t)) + virtual void DoLogString(const wxString& str, time_t WXUNUSED(t)) { wxString msg; TimeStamp(&msg); - msg += szString; + msg += str; #ifdef __WXUNIVERSAL__ m_lbox->AppendAndEnsureVisible(msg); @@ -268,7 +270,7 @@ BEGIN_EVENT_TABLE(WidgetsFrame, wxFrame) #endif // wxUSE_TOOLTIPS #if wxUSE_MENUS - EVT_WIDGETS_PAGE_CHANGED(wxID_ANY, WidgetsFrame::OnPageChanged) + EVT_WIDGETS_PAGE_CHANGING(wxID_ANY, WidgetsFrame::OnPageChanging) EVT_MENU_RANGE(Widgets_GoToPage, Widgets_GoToPageLast, WidgetsFrame::OnGoToPage) @@ -457,9 +459,10 @@ WidgetsFrame::WidgetsFrame(const wxString& title) void WidgetsFrame::InitBook() { #if USE_ICONS_IN_BOOK - wxImageList *imageList = new wxImageList(32, 32); + wxImageList *imageList = new wxImageList(ICON_SIZE, ICON_SIZE); - imageList->Add(wxBitmap(sample_xpm)); + wxImage img(sample_xpm); + imageList->Add(wxBitmap(img.Scale(ICON_SIZE, ICON_SIZE))); #else wxImageList *imageList = NULL; #endif @@ -556,10 +559,11 @@ void WidgetsFrame::InitBook() for ( size_t n = 0; n < count; n++ ) { #if USE_TREEBOOK - m_book->AddSubPage( + m_book->AddSubPage #else - books[cat]->AddPage( + books[cat]->AddPage #endif + ( pages[cat][n], labels[cat][n], false, // don't select @@ -568,27 +572,40 @@ void WidgetsFrame::InitBook() } } + Connect( wxID_ANY, + wxEVT_COMMAND_WIDGETS_PAGE_CHANGED, + wxWidgetsbookEventHandler(WidgetsFrame::OnPageChanged) ); + #if USE_TREEBOOK - // for treebook page #0 is empty parent page only + // for treebook page #0 is empty parent page only so select the first page + // with some contents + m_book->SetSelection(1); + + // but ensure that the top of the tree is shown nevertheless + wxTreeCtrl * const tree = m_book->GetTreeCtrl(); + + wxTreeItemIdValue cookie; + tree->EnsureVisible(tree->GetFirstChild(tree->GetRootItem(), cookie)); +#else + // for other books set selection twice to force connected event handler + // to force lazy creation of initial visible content m_book->SetSelection(1); m_book->SetSelection(0); -#endif +#endif // USE_TREEBOOK } WidgetsPage *WidgetsFrame::CurrentPage() { wxWindow *page = m_book->GetCurrentPage(); - if(!page) return NULL; -#if USE_TREEBOOK - return wxStaticCast(page, WidgetsPage); -#else +#if !USE_TREEBOOK WidgetsBookCtrl *subBook = wxStaticCast(page, WidgetsBookCtrl); - if (!subBook) return NULL; + wxCHECK_MSG( subBook, NULL, _T("no WidgetsBookCtrl?") ); + page = subBook->GetCurrentPage(); - if(!page) return NULL; +#endif // !USE_TREEBOOK + return wxStaticCast(page, WidgetsPage); -#endif } WidgetsFrame::~WidgetsFrame() @@ -616,24 +633,44 @@ void WidgetsFrame::OnButtonClearLog(wxCommandEvent& WXUNUSED(event)) #if wxUSE_MENUS +void WidgetsFrame::OnPageChanging(WidgetsBookCtrlEvent& event) +{ +#if USE_TREEBOOK + // don't allow selection of entries without pages (categories) + if ( !m_book->GetPage(event.GetSelection()) ) + event.Veto(); +#else + wxUnusedVar(event); +#endif +} + void WidgetsFrame::OnPageChanged(WidgetsBookCtrlEvent& event) { + const int sel = event.GetSelection(); + // adjust "Page" menu selection - wxMenuItem *item = GetMenuBar()->FindItem(Widgets_GoToPage + event.GetSelection()); - if (item) item->Check(); + wxMenuItem *item = GetMenuBar()->FindItem(Widgets_GoToPage + sel); + if ( item ) + item->Check(); + + GetMenuBar()->Check(Widgets_BusyCursor, false); - // lazy creation of the pages - WidgetsPage* page = CurrentPage(); - if (page && (page->GetChildren().GetCount()==0)) + // create the pages on demand, otherwise the sample startup is too slow as + // it creates hundreds of controls + WidgetsPage *page = CurrentPage(); + if ( page->GetChildren().empty() ) { wxWindowUpdateLocker noUpdates(page); page->CreateContent(); + //page->Layout(); + page->GetSizer()->Fit(page); + WidgetsBookCtrl *book = wxStaticCast(page->GetParent(), WidgetsBookCtrl); wxSize size; for ( size_t i = 0; i < book->GetPageCount(); ++i ) { wxWindow *page = book->GetPage(i); - if (page) + if ( page ) { size.IncTo(page->GetSize()); } @@ -659,14 +696,6 @@ void WidgetsFrame::OnGoToPage(wxCommandEvent& event) void WidgetsFrame::OnSetTooltip(wxCommandEvent& WXUNUSED(event)) { - WidgetsPage *page = CurrentPage(); - - if(!page) - { - wxLogMessage(_T("Page not selected.")); - return; - } - static wxString s_tip = _T("This is a tooltip"); wxTextEntryDialog dialog @@ -683,6 +712,8 @@ void WidgetsFrame::OnSetTooltip(wxCommandEvent& WXUNUSED(event)) s_tip = dialog.GetValue(); s_tip.Replace(_T("\\n"), _T("\n")); + WidgetsPage *page = CurrentPage(); + page->GetWidget()->SetToolTip(s_tip); wxControl *ctrl2 = page->GetWidget2(); @@ -697,11 +728,6 @@ void WidgetsFrame::OnSetFgCol(wxCommandEvent& WXUNUSED(event)) #if wxUSE_COLOURDLG // allow for debugging the default colour the first time this is called WidgetsPage *page = CurrentPage(); - if(!page) - { - wxLogMessage(_T("Page not selected.")); - return; - } if (!m_colFg.Ok()) m_colFg = page->GetForegroundColour(); @@ -730,11 +756,6 @@ void WidgetsFrame::OnSetBgCol(wxCommandEvent& WXUNUSED(event)) { #if wxUSE_COLOURDLG WidgetsPage *page = CurrentPage(); - if(!page) - { - wxLogMessage(_T("Page not selected.")); - return; - } if ( !m_colBg.Ok() ) m_colBg = page->GetBackgroundColour(); @@ -763,11 +784,6 @@ void WidgetsFrame::OnSetFont(wxCommandEvent& WXUNUSED(event)) { #if wxUSE_FONTDLG WidgetsPage *page = CurrentPage(); - if(!page) - { - wxLogMessage(_T("Page not selected.")); - return; - } if (!m_font.Ok()) m_font = page->GetFont(); @@ -794,14 +810,7 @@ void WidgetsFrame::OnSetFont(wxCommandEvent& WXUNUSED(event)) void WidgetsFrame::OnEnable(wxCommandEvent& event) { - WidgetsPage *page = CurrentPage(); - if(!page) - { - wxLogMessage(_T("Page not selected.")); - return; - } - - page->GetWidget()->Enable(event.IsChecked()); + CurrentPage()->GetWidget()->Enable(event.IsChecked()); } void WidgetsFrame::OnSetBorder(wxCommandEvent& event) @@ -828,12 +837,6 @@ void WidgetsFrame::OnSetBorder(wxCommandEvent& event) WidgetsPage *page = CurrentPage(); - if(!page) - { - wxLogMessage(_T("Page not selected.")); - return; - } - page->RecreateWidget(); } @@ -847,9 +850,9 @@ void WidgetsFrame::OnToggleGlobalBusyCursor(wxCommandEvent& event) void WidgetsFrame::OnToggleBusyCursor(wxCommandEvent& event) { - WidgetsPage *page = CurrentPage(); - page->GetWidget()->SetCursor(*(event.IsChecked() ? wxHOURGLASS_CURSOR - : wxSTANDARD_CURSOR)); + CurrentPage()->GetWidget()->SetCursor(*(event.IsChecked() + ? wxHOURGLASS_CURSOR + : wxSTANDARD_CURSOR)); } #endif // wxUSE_MENUS @@ -928,7 +931,7 @@ WidgetsPage::WidgetsPage(WidgetsBookCtrl *book, wxTAB_TRAVERSAL) { #if USE_ICONS_IN_BOOK - imaglist->Add(wxBitmap(icon)); + imaglist->Add(wxBitmap(wxImage(icon).Scale(ICON_SIZE, ICON_SIZE))); #else wxUnusedVar(imaglist); wxUnusedVar(icon);