X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/befa6d980e781d3afc961ab5b28f9fed9d4c0fab..7946d7deaac081a745dc616a5eb13ae864865fa2:/samples/checklst/checklst.cpp?ds=sidebyside diff --git a/samples/checklst/checklst.cpp b/samples/checklst/checklst.cpp index 9846d2008b..c5d5cd7580 100644 --- a/samples/checklst/checklst.cpp +++ b/samples/checklst/checklst.cpp @@ -30,6 +30,7 @@ #include "wx/log.h" +#include "wx/sizer.h" #include "wx/menuitem.h" #include "wx/checklst.h" @@ -61,6 +62,8 @@ public: private: void OnButtonMove(bool up); + void AdjustColour(size_t index); + wxCheckListBox *m_pListBox; DECLARE_EVENT_TABLE() @@ -156,20 +159,37 @@ CheckListBoxFrame::CheckListBoxFrame(wxFrame *frame, delete [] astrChoices; - // not implemented in other ports yet -#ifdef __WXMSW__ // set grey background for every second entry for ( ui = 0; ui < WXSIZEOF(aszChoices); ui += 2 ) { - m_pListBox->GetItem(ui)->SetBackgroundColour(wxColor(200, 200, 200)); + AdjustColour(ui); } -#endif // wxGTK m_pListBox->Check(2); // create buttons for moving the items around - (void)new wxButton(panel, Btn_Up, " &Up ", wxPoint(420, 90)); - (void)new wxButton(panel, Btn_Down, "&Down", wxPoint(420, 120)); + wxButton *button1 = new wxButton(panel, Btn_Up, " &Up ", wxPoint(420, 90)); + wxButton *button2 = new wxButton(panel, Btn_Down, "&Down", wxPoint(420, 120)); + + + wxBoxSizer *mainsizer = new wxBoxSizer( wxVERTICAL ); + + mainsizer->Add( m_pListBox, 1, wxGROW|wxALL, 10 ); + + wxBoxSizer *bottomsizer = new wxBoxSizer( wxHORIZONTAL ); + + bottomsizer->Add( button1, 0, wxALL, 10 ); + bottomsizer->Add( button2, 0, wxALL, 10 ); + + mainsizer->Add( bottomsizer, 0, wxCENTER ); + + // tell frame to make use of sizer (or constraints, if any) + panel->SetAutoLayout( TRUE ); + panel->SetSizer( mainsizer ); + + // don't allow frame to get smaller than what the sizers tell ye + mainsizer->SetSizeHints( this ); + Show(TRUE); } @@ -184,24 +204,24 @@ void CheckListBoxFrame::OnQuit(wxCommandEvent& WXUNUSED(event)) void CheckListBoxFrame::OnAbout(wxCommandEvent& WXUNUSED(event)) { - wxMessageBox(_T("Demo of wxCheckListBox control\n" + wxMessageBox(wxT("Demo of wxCheckListBox control\n" "© Vadim Zeitlin 1998-1999"), - _T("About wxCheckListBox"), + wxT("About wxCheckListBox"), wxICON_INFORMATION, this); } void CheckListBoxFrame::OnListboxSelect(wxCommandEvent& event) { int nSel = event.GetSelection(); - wxLogStatus(this, _T("item %d selected (%schecked)"), nSel, - m_pListBox->IsChecked(nSel) ? _T("") : _T("not ")); + wxLogStatus(this, wxT("Item %d selected (%schecked)"), nSel, + m_pListBox->IsChecked(nSel) ? _T("") : wxT("not ")); } void CheckListBoxFrame::OnListboxDblClick(wxCommandEvent& WXUNUSED(event)) { wxString strSelection; - strSelection.sprintf(_T("item %d double clicked"), m_pListBox->GetSelection()); - wxMessageDialog dialog(this, strSelection); + strSelection.sprintf(wxT("Item %d double clicked"), m_pListBox->GetSelection()); + wxMessageDialog dialog(this, strSelection, wxT("wxCheckListBox message"), wxICON_INFORMATION); dialog.ShowModal(); } @@ -209,8 +229,8 @@ void CheckListBoxFrame::OnCheckboxToggle(wxCommandEvent& event) { unsigned int nItem = event.GetInt(); - wxLogStatus(this, _T("item %d was %schecked"), nItem, - m_pListBox->IsChecked(nItem) ? _T("") : _T("un")); + wxLogStatus(this, wxT("item %d was %schecked"), nItem, + m_pListBox->IsChecked(nItem) ? wxT("") : wxT("un")); } void CheckListBoxFrame::OnButtonUp(wxCommandEvent& WXUNUSED(event)) @@ -231,9 +251,9 @@ void CheckListBoxFrame::OnButtonMove(bool up) wxString label = m_pListBox->GetString(selection); int positionNew = up ? selection - 1 : selection + 2; - if ( positionNew < 0 || positionNew > m_pListBox->Number() ) + if ( positionNew < 0 || positionNew > m_pListBox->GetCount() ) { - wxLogStatus(this, _T("Can't move this item %s"), up ? _T("up") : _T("down")); + wxLogStatus(this, wxT("Can't move this item %s"), up ? wxT("up") : wxT("down")); } else { @@ -251,11 +271,24 @@ void CheckListBoxFrame::OnButtonMove(bool up) m_pListBox->Check(selectionNew, wasChecked); m_pListBox->SetSelection(selectionNew); - wxLogStatus(this, _T("Item moved %s"), up ? _T("up") : _T("down")); + AdjustColour(selection); + AdjustColour(selectionNew); + + wxLogStatus(this, wxT("Item moved %s"), up ? wxT("up") : wxT("down")); } } else { - wxLogStatus(this, _T("Please select an item")); + wxLogStatus(this, wxT("Please select an item")); } } + +void CheckListBoxFrame::AdjustColour(size_t index) +{ + // not implemented in other ports yet +#ifdef __WXMSW__ + // even items have grey backround, odd ones - white + unsigned char c = index % 2 ? 255 : 200; + m_pListBox->GetItem(index)->SetBackgroundColour(wxColor(c, c, c)); +#endif // wxMSW +}