X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/895cc205971a8b28583ddb27161e4adf045114a4..1a51ca330303a38f0af3ad64bb17b9137612fd48:/samples/widgets/widgets.cpp diff --git a/samples/widgets/widgets.cpp b/samples/widgets/widgets.cpp index 25d11d88b7..f0e31be924 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" @@ -82,6 +83,9 @@ enum Widgets_BorderDouble, Widgets_BorderDefault, + Widgets_GlobalBusyCursor, + Widgets_BusyCursor, + Widgets_GoToPage, Widgets_GoToPageLast = Widgets_GoToPage + 100 }; @@ -134,6 +138,7 @@ protected: void OnExit(wxCommandEvent& event); #if wxUSE_MENUS + void OnPageChanging(WidgetsBookCtrlEvent& event); void OnPageChanged(WidgetsBookCtrlEvent& event); void OnGoToPage(wxCommandEvent& event); @@ -145,12 +150,15 @@ protected: void OnSetFont(wxCommandEvent& event); void OnEnable(wxCommandEvent& event); void OnSetBorder(wxCommandEvent& event); + + void OnToggleGlobalBusyCursor(wxCommandEvent& event); + void OnToggleBusyCursor(wxCommandEvent& event); #endif // wxUSE_MENUS // 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: @@ -262,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) @@ -274,6 +282,9 @@ BEGIN_EVENT_TABLE(WidgetsFrame, wxFrame) EVT_MENU_RANGE(Widgets_BorderNone, Widgets_BorderDefault, WidgetsFrame::OnSetBorder) + EVT_MENU(Widgets_GlobalBusyCursor, WidgetsFrame::OnToggleGlobalBusyCursor) + EVT_MENU(Widgets_BusyCursor, WidgetsFrame::OnToggleBusyCursor) + EVT_MENU(wxID_EXIT, WidgetsFrame::OnExit) #endif // wxUSE_MENUS END_EVENT_TABLE() @@ -325,12 +336,7 @@ bool WidgetsApp::OnInit() // ---------------------------------------------------------------------------- WidgetsFrame::WidgetsFrame(const wxString& title) - : wxFrame(NULL, wxID_ANY, title, - wxDefaultPosition, wxDefaultSize, - wxDEFAULT_FRAME_STYLE | - wxNO_FULL_REPAINT_ON_RESIZE | - wxCLIP_CHILDREN | - wxTAB_TRAVERSAL) + : wxFrame(NULL, wxID_ANY, title) { // set the frame icon SetIcon(wxICON(sample)); @@ -365,6 +371,12 @@ WidgetsFrame::WidgetsFrame(const wxString& title) menuBorders->AppendRadioItem(Widgets_BorderSunken, _T("S&unken\tCtrl-Shift-5")); menuWidget->AppendSubMenu(menuBorders, _T("Set &border")); + menuWidget->AppendSeparator(); + menuWidget->AppendCheckItem(Widgets_GlobalBusyCursor, + _T("Toggle &global busy cursor\tCtrl-Shift-U")); + menuWidget->AppendCheckItem(Widgets_BusyCursor, + _T("Toggle b&usy cursor\tCtrl-U")); + menuWidget->AppendSeparator(); menuWidget->Append(wxID_EXIT, _T("&Quit\tCtrl-Q")); mbar->Append(menuWidget, _T("&Widget")); @@ -374,15 +386,14 @@ WidgetsFrame::WidgetsFrame(const wxString& title) #endif // wxUSE_MENUS // create controls - m_panel = new wxPanel(this, wxID_ANY, - wxDefaultPosition, wxDefaultSize, wxCLIP_CHILDREN); + m_panel = new wxPanel(this, wxID_ANY); wxSizer *sizerTop = new wxBoxSizer(wxVERTICAL); // we have 2 panes: book with pages demonstrating the controls in the // upper one and the log window with some buttons in the lower - int style = wxNO_FULL_REPAINT_ON_RESIZE|wxCLIP_CHILDREN|wxBK_DEFAULT; + int style = wxBK_DEFAULT; // Uncomment to suppress page theme (draw in solid colour) //style |= wxNB_NOPAGETHEME; @@ -448,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 @@ -547,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 @@ -559,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() @@ -607,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()); } @@ -667,6 +713,7 @@ void WidgetsFrame::OnSetTooltip(wxCommandEvent& WXUNUSED(event)) s_tip.Replace(_T("\\n"), _T("\n")); WidgetsPage *page = CurrentPage(); + page->GetWidget()->SetToolTip(s_tip); wxControl *ctrl2 = page->GetWidget2(); @@ -681,6 +728,7 @@ 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 (!m_colFg.Ok()) m_colFg = page->GetForegroundColour(); @@ -708,6 +756,7 @@ void WidgetsFrame::OnSetBgCol(wxCommandEvent& WXUNUSED(event)) { #if wxUSE_COLOURDLG WidgetsPage *page = CurrentPage(); + if ( !m_colBg.Ok() ) m_colBg = page->GetBackgroundColour(); @@ -735,6 +784,7 @@ void WidgetsFrame::OnSetFont(wxCommandEvent& WXUNUSED(event)) { #if wxUSE_FONTDLG WidgetsPage *page = CurrentPage(); + if (!m_font.Ok()) m_font = page->GetFont(); @@ -760,8 +810,7 @@ void WidgetsFrame::OnSetFont(wxCommandEvent& WXUNUSED(event)) void WidgetsFrame::OnEnable(wxCommandEvent& event) { - WidgetsPage *page = CurrentPage(); - page->GetWidget()->Enable(event.IsChecked()); + CurrentPage()->GetWidget()->Enable(event.IsChecked()); } void WidgetsFrame::OnSetBorder(wxCommandEvent& event) @@ -787,9 +836,25 @@ void WidgetsFrame::OnSetBorder(wxCommandEvent& event) WidgetsPage::ms_defaultFlags |= border; WidgetsPage *page = CurrentPage(); + page->RecreateWidget(); } +void WidgetsFrame::OnToggleGlobalBusyCursor(wxCommandEvent& event) +{ + if ( event.IsChecked() ) + wxBeginBusyCursor(); + else + wxEndBusyCursor(); +} + +void WidgetsFrame::OnToggleBusyCursor(wxCommandEvent& event) +{ + CurrentPage()->GetWidget()->SetCursor(*(event.IsChecked() + ? wxHOURGLASS_CURSOR + : wxSTANDARD_CURSOR)); +} + #endif // wxUSE_MENUS // ---------------------------------------------------------------------------- @@ -866,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);