X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/7d1b5cb6ea8c43594800c092f67dde982a7f3fb1..17b1d76b4add82305463d10b9f65668d06169363:/samples/widgets/widgets.cpp?ds=sidebyside diff --git a/samples/widgets/widgets.cpp b/samples/widgets/widgets.cpp index c4c1039a11..510cdbc658 100644 --- a/samples/widgets/widgets.cpp +++ b/samples/widgets/widgets.cpp @@ -47,6 +47,8 @@ #include "wx/colordlg.h" #include "wx/fontdlg.h" #include "wx/textdlg.h" +#include "wx/imaglist.h" +#include "wx/wupdlock.h" #include "widgets.h" @@ -80,12 +82,19 @@ enum Widgets_BorderDouble, Widgets_BorderDefault, + Widgets_GlobalBusyCursor, + Widgets_BusyCursor, + Widgets_GoToPage, Widgets_GoToPageLast = Widgets_GoToPage + 100 }; const wxChar *WidgetsCategories[MAX_PAGES] = { +#if defined(__WXUNIVERSAL__) + wxT("Universal"), +#else wxT("Native"), +#endif wxT("Generic"), wxT("Pickers"), wxT("Comboboxes"), @@ -128,6 +137,7 @@ protected: void OnExit(wxCommandEvent& event); #if wxUSE_MENUS + void OnPageChanging(WidgetsBookCtrlEvent& event); void OnPageChanged(WidgetsBookCtrlEvent& event); void OnGoToPage(wxCommandEvent& event); @@ -139,12 +149,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: @@ -256,7 +269,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) @@ -268,6 +281,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() @@ -319,12 +335,7 @@ bool WidgetsApp::OnInit() // ---------------------------------------------------------------------------- WidgetsFrame::WidgetsFrame(const wxString& title) - : wxFrame(NULL, wxID_ANY, title, - wxPoint(0, 50), 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)); @@ -359,6 +370,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")); @@ -368,15 +385,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; @@ -389,7 +405,7 @@ WidgetsFrame::WidgetsFrame(const wxString& title) style); InitBook(); -#ifndef __SMARTPHONE__ +#ifndef __WXHANDHELD__ // the lower one only has the log listbox and a button to clear it #if USE_LOG wxSizer *sizerDown = new wxStaticBoxSizer( @@ -419,11 +435,11 @@ WidgetsFrame::WidgetsFrame(const wxString& title) sizerTop->Add(0, 5, 0, wxGROW); // spacer in between sizerTop->Add(sizerDown, 0, wxGROW | (wxALL & ~wxTOP), 10); -#else // !__SMARTPHONE__/__SMARTPHONE__ +#else // !__WXHANDHELD__/__WXHANDHELD__ sizerTop->Add(m_book, 1, wxGROW | wxALL ); -#endif // __SMARTPHONE__ +#endif // __WXHANDHELD__ m_panel->SetSizer(sizerTop); @@ -441,9 +457,13 @@ WidgetsFrame::WidgetsFrame(const wxString& title) void WidgetsFrame::InitBook() { +#if USE_ICONS_IN_BOOK wxImageList *imageList = new wxImageList(32, 32); imageList->Add(wxBitmap(sample_xpm)); +#else + wxImageList *imageList = NULL; +#endif #if !USE_TREEBOOK WidgetsBookCtrl *books[MAX_PAGES]; @@ -465,7 +485,11 @@ void WidgetsFrame::InitBook() #if USE_TREEBOOK nPage++; // increase for parent page #else - books[cat] = new WidgetsBookCtrl( m_book, wxID_ANY ); + books[cat] = new WidgetsBookCtrl(m_book, + wxID_ANY, + wxDefaultPosition, + wxDefaultSize, + wxBK_DEFAULT); #endif for ( WidgetsPageInfo *info = WidgetsPage::ms_widgetPages; @@ -513,7 +537,9 @@ void WidgetsFrame::InitBook() GetMenuBar()->Append(menuPages, _T("&Page")); +#if USE_ICONS_IN_BOOK m_book->AssignImageList(imageList); +#endif for ( cat = 0; cat < MAX_PAGES; cat++ ) { @@ -521,7 +547,9 @@ void WidgetsFrame::InitBook() m_book->AddPage(NULL,WidgetsCategories[cat],false,0); #else m_book->AddPage(books[cat],WidgetsCategories[cat],false,0); +#if USE_ICONS_IN_BOOK books[cat]->SetImageList(imageList); +#endif #endif // now do add them @@ -529,10 +557,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 @@ -541,22 +570,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() { -#if USE_TREEBOOK - return wxStaticCast(m_book->GetCurrentPage(), WidgetsPage); -#else - WidgetsBookCtrl *book = wxStaticCast(m_book->GetCurrentPage(), WidgetsBookCtrl); - if (!book) return NULL; - return wxStaticCast(book->GetCurrentPage(), WidgetsPage); -#endif + wxWindow *page = m_book->GetCurrentPage(); + +#if !USE_TREEBOOK + WidgetsBookCtrl *subBook = wxStaticCast(page, WidgetsBookCtrl); + wxCHECK_MSG( subBook, NULL, _T("no WidgetsBookCtrl?") ); + + page = subBook->GetCurrentPage(); +#endif // !USE_TREEBOOK + + return wxStaticCast(page, WidgetsPage); } WidgetsFrame::~WidgetsFrame() @@ -584,10 +631,47 @@ 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) { - wxMenuItem *item = GetMenuBar()->FindItem(Widgets_GoToPage + event.GetSelection()); - if (item) item->Check(); + const int sel = event.GetSelection(); + + // adjust "Page" menu selection + 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->GetChildren().empty() ) + { + wxWindowUpdateLocker noUpdates(page); + page->CreateContent(); + WidgetsBookCtrl *book = wxStaticCast(page->GetParent(), WidgetsBookCtrl); + wxSize size; + for ( size_t i = 0; i < book->GetPageCount(); ++i ) + { + wxWindow *page = book->GetPage(i); + if ( page ) + { + size.IncTo(page->GetSize()); + } + } + page->SetSize(size); + } + event.Skip(); } @@ -623,6 +707,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(); @@ -637,6 +722,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(); @@ -664,6 +750,7 @@ void WidgetsFrame::OnSetBgCol(wxCommandEvent& WXUNUSED(event)) { #if wxUSE_COLOURDLG WidgetsPage *page = CurrentPage(); + if ( !m_colBg.Ok() ) m_colBg = page->GetBackgroundColour(); @@ -691,6 +778,7 @@ void WidgetsFrame::OnSetFont(wxCommandEvent& WXUNUSED(event)) { #if wxUSE_FONTDLG WidgetsPage *page = CurrentPage(); + if (!m_font.Ok()) m_font = page->GetFont(); @@ -716,8 +804,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) @@ -743,9 +830,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 // ---------------------------------------------------------------------------- @@ -812,13 +915,21 @@ WidgetsPageInfo::WidgetsPageInfo(Constructor ctor, const wxChar *label, int cate int WidgetsPage::ms_defaultFlags = wxBORDER_DEFAULT; WidgetsPageInfo *WidgetsPage::ms_widgetPages = NULL; -WidgetsPage::WidgetsPage(WidgetsBookCtrl *book) +WidgetsPage::WidgetsPage(WidgetsBookCtrl *book, + wxImageList *imaglist, + char* icon[]) : wxPanel(book, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxNO_FULL_REPAINT_ON_RESIZE | wxCLIP_CHILDREN | wxTAB_TRAVERSAL) { +#if USE_ICONS_IN_BOOK + imaglist->Add(wxBitmap(icon)); +#else + wxUnusedVar(imaglist); + wxUnusedVar(icon); +#endif } wxSizer *WidgetsPage::CreateSizerWithText(wxControl *control,