X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/2f073eb2e0786fa44dd41d31eb34d00a75ab0570..546f34572dcb324b7f55cf3810cb4c6cfbb42225:/samples/checklst/checklst.cpp?ds=sidebyside diff --git a/samples/checklst/checklst.cpp b/samples/checklst/checklst.cpp index fdefc46f6c..553bf0760c 100644 --- a/samples/checklst/checklst.cpp +++ b/samples/checklst/checklst.cpp @@ -62,6 +62,8 @@ public: private: void OnButtonMove(bool up); + void AdjustColour(size_t index); + wxCheckListBox *m_pListBox; DECLARE_EVENT_TABLE() @@ -157,13 +159,10 @@ 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); @@ -205,24 +204,23 @@ void CheckListBoxFrame::OnQuit(wxCommandEvent& WXUNUSED(event)) void CheckListBoxFrame::OnAbout(wxCommandEvent& WXUNUSED(event)) { - wxMessageBox(_T("Demo of wxCheckListBox control\n" - "© Vadim Zeitlin 1998-1999"), - _T("About wxCheckListBox"), + wxMessageBox(wxT("Demo of wxCheckListBox control\n© Vadim Zeitlin 1998-1999"), + 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(); } @@ -230,8 +228,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)) @@ -252,9 +250,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 { @@ -272,11 +270,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 +}