X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/aaa6d89a0d0810b001a9217df913b9b74b883c8d..fc32630a5e03e60a67d4ef53fc59985ea087b451:/src/motif/checklst.cpp?ds=inline diff --git a/src/motif/checklst.cpp b/src/motif/checklst.cpp index ea21e7e192..ff83d6d2c5 100644 --- a/src/motif/checklst.cpp +++ b/src/motif/checklst.cpp @@ -51,15 +51,6 @@ static inline const wxString& Prefix(bool checked) static inline bool IsChecked(const wxString& s) { wxASSERT(s.length() >=4); return s[1] == checkChar; } -static void CopyStringsAddingPrefix(const wxArrayString& orig, - wxArrayString& copy) -{ - copy.Clear(); - - for(size_t i = 0; i < orig.GetCount(); ++i ) - copy.Add( Prefix(false) + orig[i] ); -} - // def ctor: use Create() to really create the control wxCheckListBox::wxCheckListBox() : wxCheckListBoxBase() { @@ -134,7 +125,7 @@ void wxCheckListBox::Check(unsigned int uiIndex, bool bCheck) void wxCheckListBox::DoToggleItem( int n, int x ) { - if( x < 23 ) + if( x > 0 && x < 23 ) { wxString label = wxListBox::GetString(n); label[1u] = (!::IsChecked(label)) ? checkChar : uncheckChar; @@ -150,15 +141,10 @@ void wxCheckListBox::DoToggleItem( int n, int x ) event.SetEventObject(this); event.SetString(GetString(n)); - GetEventHandler()->ProcessEvent(event); + HandleWindowEvent(event); } } -int wxCheckListBox::DoAppend(const wxString& item) -{ - return wxListBox::DoAppend( Prefix(false) + item ); -} - int wxCheckListBox::FindString(const wxString& s, bool bCase) const { int n1 = wxListBox::FindString(Prefix(false) + s, bCase); @@ -183,18 +169,16 @@ wxString wxCheckListBox::GetString(unsigned int n) const return wxListBox::GetString(n).substr(4); } -void wxCheckListBox::DoInsertItems(const wxArrayString& items, unsigned int pos) +int wxCheckListBox::DoInsertItems(const wxArrayStringsAdapter& items, + unsigned int pos, + void **clientData, wxClientDataType type) { wxArrayString copy; - CopyStringsAddingPrefix(items, copy); - wxListBox::DoInsertItems(copy, pos); -} + copy.reserve(pos); + for ( size_t i = 0; i < items.GetCount(); ++i ) + copy.push_back( Prefix(false) + items[i] ); -void wxCheckListBox::DoSetItems(const wxArrayString& items, void **clientData) -{ - wxArrayString copy; - CopyStringsAddingPrefix(items, copy); - wxListBox::DoSetItems(copy, clientData); + return wxListBox::DoInsertItems(copy, pos, clientData, type); } #endif // wxUSE_CHECKLISTBOX