X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/f2fdc4d56e41711ce7c547484bf97aa0c2bd997a..02fd8b9b6186623ed61019ac7e69ed9a4ef16773:/samples/widgets/listbox.cpp?ds=sidebyside diff --git a/samples/widgets/listbox.cpp b/samples/widgets/listbox.cpp index 0a40eb74e1..5a894aad8b 100644 --- a/samples/widgets/listbox.cpp +++ b/samples/widgets/listbox.cpp @@ -44,6 +44,7 @@ #include "wx/checklst.h" +#include "itemcontainer.h" #include "widgets.h" #include "icons/listbox.xpm" @@ -55,7 +56,7 @@ // control ids enum { - ListboxPage_Reset = 100, + ListboxPage_Reset = wxID_HIGHEST, ListboxPage_Add, ListboxPage_AddText, ListboxPage_AddSeveral, @@ -66,25 +67,33 @@ enum ListboxPage_Delete, ListboxPage_DeleteText, ListboxPage_DeleteSel, - ListboxPage_Listbox + ListboxPage_Listbox, + ListboxPage_EnsureVisible, + ListboxPage_EnsureVisibleText, + ListboxPage_ContainerTests }; // ---------------------------------------------------------------------------- // ListboxWidgetsPage // ---------------------------------------------------------------------------- -class ListboxWidgetsPage : public WidgetsPage +class ListboxWidgetsPage : public ItemContainerWidgetsPage { public: ListboxWidgetsPage(WidgetsBookCtrl *book, wxImageList *imaglist); virtual wxControl *GetWidget() const { return m_lbox; } + virtual wxItemContainer* GetContainer() const { return m_lbox; } virtual void RecreateWidget() { CreateLbox(); } + // lazy creation of the content + virtual void CreateContent(); + protected: // event handlers void OnButtonReset(wxCommandEvent& event); void OnButtonChange(wxCommandEvent& event); + void OnButtonEnsureVisible(wxCommandEvent& event); void OnButtonDelete(wxCommandEvent& event); void OnButtonDeleteSel(wxCommandEvent& event); void OnButtonClear(wxCommandEvent& event); @@ -100,6 +109,7 @@ protected: void OnUpdateUIAddSeveral(wxUpdateUIEvent& event); void OnUpdateUIClearButton(wxUpdateUIEvent& event); + void OnUpdateUIEnsureVisibleButton(wxUpdateUIEvent& event); void OnUpdateUIDeleteButton(wxUpdateUIEvent& event); void OnUpdateUIDeleteSelButton(wxUpdateUIEvent& event); void OnUpdateUIResetButton(wxUpdateUIEvent& event); @@ -110,6 +120,11 @@ protected: // (re)create the listbox void CreateLbox(); + // read the value of a listbox item index from the given control, return + // false if it's invalid + bool GetValidIndexFromText(const wxTextCtrl *text, int *n = NULL) const; + + // listbox parameters // ------------------ @@ -142,12 +157,19 @@ protected: *m_chkOwnerDraw; // the listbox itself and the sizer it is in - wxListBox *m_lbox; +#ifdef __WXWINCE__ + wxListBoxBase +#else + wxListBox +#endif + *m_lbox; + wxSizer *m_sizerLbox; // the text entries for "Add/change string" and "Delete" buttons wxTextCtrl *m_textAdd, *m_textChange, + *m_textEnsureVisible, *m_textDelete; private: @@ -164,13 +186,16 @@ BEGIN_EVENT_TABLE(ListboxWidgetsPage, WidgetsPage) EVT_BUTTON(ListboxPage_Change, ListboxWidgetsPage::OnButtonChange) EVT_BUTTON(ListboxPage_Delete, ListboxWidgetsPage::OnButtonDelete) EVT_BUTTON(ListboxPage_DeleteSel, ListboxWidgetsPage::OnButtonDeleteSel) + EVT_BUTTON(ListboxPage_EnsureVisible, ListboxWidgetsPage::OnButtonEnsureVisible) EVT_BUTTON(ListboxPage_Clear, ListboxWidgetsPage::OnButtonClear) EVT_BUTTON(ListboxPage_Add, ListboxWidgetsPage::OnButtonAdd) EVT_BUTTON(ListboxPage_AddSeveral, ListboxWidgetsPage::OnButtonAddSeveral) EVT_BUTTON(ListboxPage_AddMany, ListboxWidgetsPage::OnButtonAddMany) + EVT_BUTTON(ListboxPage_ContainerTests, ItemContainerWidgetsPage::OnButtonTestItemContainer) EVT_TEXT_ENTER(ListboxPage_AddText, ListboxWidgetsPage::OnButtonAdd) EVT_TEXT_ENTER(ListboxPage_DeleteText, ListboxWidgetsPage::OnButtonDelete) + EVT_TEXT_ENTER(ListboxPage_EnsureVisibleText, ListboxWidgetsPage::OnButtonEnsureVisible) EVT_UPDATE_UI(ListboxPage_Reset, ListboxWidgetsPage::OnUpdateUIResetButton) EVT_UPDATE_UI(ListboxPage_AddSeveral, ListboxWidgetsPage::OnUpdateUIAddSeveral) @@ -180,6 +205,7 @@ BEGIN_EVENT_TABLE(ListboxWidgetsPage, WidgetsPage) EVT_UPDATE_UI(ListboxPage_Change, ListboxWidgetsPage::OnUpdateUIDeleteSelButton) EVT_UPDATE_UI(ListboxPage_ChangeText, ListboxWidgetsPage::OnUpdateUIDeleteSelButton) EVT_UPDATE_UI(ListboxPage_DeleteSel, ListboxWidgetsPage::OnUpdateUIDeleteSelButton) + EVT_UPDATE_UI(ListboxPage_EnsureVisible, ListboxWidgetsPage::OnUpdateUIEnsureVisibleButton) EVT_LISTBOX(ListboxPage_Listbox, ListboxWidgetsPage::OnListbox) EVT_LISTBOX_DCLICK(ListboxPage_Listbox, ListboxWidgetsPage::OnListboxDClick) @@ -193,17 +219,20 @@ END_EVENT_TABLE() // implementation // ============================================================================ +#if defined(__WXUNIVERSAL__) + #define FAMILY_CTRLS UNIVERSAL_CTRLS +#else + #define FAMILY_CTRLS NATIVE_CTRLS +#endif + IMPLEMENT_WIDGETS_PAGE(ListboxWidgetsPage, _T("Listbox"), - (int)wxPlatform(GENERIC_CTRLS).If(wxMSW,NATIVE_CTRLS) - | WITH_ITEMS_CTRLS + FAMILY_CTRLS | WITH_ITEMS_CTRLS ); ListboxWidgetsPage::ListboxWidgetsPage(WidgetsBookCtrl *book, wxImageList *imaglist) - : WidgetsPage(book) + : ItemContainerWidgetsPage(book, imaglist, listbox_xpm) { - imaglist->Add(wxBitmap(listbox_xpm)); - // init everything m_radioSelMode = (wxRadioBox *)NULL; @@ -213,9 +242,13 @@ ListboxWidgetsPage::ListboxWidgetsPage(WidgetsBookCtrl *book, m_chkSort = m_chkOwnerDraw = (wxCheckBox *)NULL; - m_lbox = (wxListBox *)NULL; + m_lbox = NULL; m_sizerLbox = (wxSizer *)NULL; +} + +void ListboxWidgetsPage::CreateContent() +{ /* What we create here is a frame having 3 panes: style pane is the leftmost one, in the middle the pane with buttons allowing to perform @@ -286,6 +319,13 @@ ListboxWidgetsPage::ListboxWidgetsPage(WidgetsBookCtrl *book, sizerRow->Add(m_textChange, 1, wxLEFT, 5); sizerMiddle->Add(sizerRow, 0, wxALL | wxGROW, 5); + sizerRow = new wxBoxSizer(wxHORIZONTAL); + btn = new wxButton(this, ListboxPage_EnsureVisible, _T("Make item &visible")); + m_textEnsureVisible = new wxTextCtrl(this, ListboxPage_EnsureVisibleText, wxEmptyString); + sizerRow->Add(btn, 0, wxRIGHT, 5); + sizerRow->Add(m_textEnsureVisible, 1, wxLEFT, 5); + sizerMiddle->Add(sizerRow, 0, wxALL | wxGROW, 5); + sizerRow = new wxBoxSizer(wxHORIZONTAL); btn = new wxButton(this, ListboxPage_Delete, _T("&Delete this item")); m_textDelete = new wxTextCtrl(this, ListboxPage_DeleteText, wxEmptyString); @@ -299,6 +339,9 @@ ListboxWidgetsPage::ListboxWidgetsPage(WidgetsBookCtrl *book, btn = new wxButton(this, ListboxPage_Clear, _T("&Clear")); sizerMiddle->Add(btn, 0, wxALL | wxGROW, 5); + btn = new wxButton(this, ListboxPage_ContainerTests, _T("Run &tests")); + sizerMiddle->Add(btn, 0, wxALL | wxGROW, 5); + // right pane wxSizer *sizerRight = new wxBoxSizer(wxVERTICAL); m_lbox = new wxListBox(this, ListboxPage_Listbox, @@ -318,8 +361,6 @@ ListboxWidgetsPage::ListboxWidgetsPage(WidgetsBookCtrl *book, Reset(); SetSizer(sizerTop); - - sizerTop->Fit(this); } // ---------------------------------------------------------------------------- @@ -393,6 +434,30 @@ void ListboxWidgetsPage::CreateLbox() m_sizerLbox->Layout(); } +// ---------------------------------------------------------------------------- +// miscellaneous helpers +// ---------------------------------------------------------------------------- + +bool +ListboxWidgetsPage::GetValidIndexFromText(const wxTextCtrl *text, int *n) const +{ + unsigned long idx; + if ( !text->GetValue().ToULong(&idx) || (idx >= m_lbox->GetCount()) ) + { + // don't give the warning if we're just testing but do give it if we + // want to retrieve the value as this is only done in answer to a user + // action + if ( n ) + wxLogWarning("Invalid index \"%s\"", text->GetValue()); + return false; + } + + if ( n ) + *n = idx; + + return true; +} + // ---------------------------------------------------------------------------- // event handlers // ---------------------------------------------------------------------------- @@ -415,11 +480,21 @@ void ListboxWidgetsPage::OnButtonChange(wxCommandEvent& WXUNUSED(event)) } } +void ListboxWidgetsPage::OnButtonEnsureVisible(wxCommandEvent& WXUNUSED(event)) +{ + int n; + if ( !GetValidIndexFromText(m_textEnsureVisible, &n) ) + { + return; + } + + m_lbox->EnsureVisible(n); +} + void ListboxWidgetsPage::OnButtonDelete(wxCommandEvent& WXUNUSED(event)) { - unsigned long n; - if ( !m_textDelete->GetValue().ToULong(&n) || - (n >= (unsigned)m_lbox->GetCount()) ) + int n; + if ( !GetValidIndexFromText(m_textDelete, &n) ) { return; } @@ -483,11 +558,14 @@ void ListboxWidgetsPage::OnUpdateUIResetButton(wxUpdateUIEvent& event) m_chkVScroll->GetValue() ); } +void ListboxWidgetsPage::OnUpdateUIEnsureVisibleButton(wxUpdateUIEvent& event) +{ + event.Enable(GetValidIndexFromText(m_textEnsureVisible)); +} + void ListboxWidgetsPage::OnUpdateUIDeleteButton(wxUpdateUIEvent& event) { - unsigned long n; - event.Enable(m_textDelete->GetValue().ToULong(&n) && - (n < (unsigned)m_lbox->GetCount())); + event.Enable(GetValidIndexFromText(m_textDelete)); } void ListboxWidgetsPage::OnUpdateUIDeleteSelButton(wxUpdateUIEvent& event)