X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/c266945cab18b6f34286235f2950970575259339..64ea838d8f4d1853b7d850db93ee565e901d099a:/src/motif/checklst.cpp?ds=sidebyside diff --git a/src/motif/checklst.cpp b/src/motif/checklst.cpp index 54e230848e..b461e6ab3a 100644 --- a/src/motif/checklst.cpp +++ b/src/motif/checklst.cpp @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////////// -// Name: checklst.cpp +// Name: src/motif/checklst.cpp // Purpose: implementation of wxCheckListBox class // Author: Julian Smart // Modified by: @@ -13,20 +13,21 @@ // headers & declarations // ============================================================================ -#ifdef __GNUG__ -#pragma implementation "checklst.h" -#endif +// For compilers that support precompilation, includes "wx.h". +#include "wx/wxprec.h" -#include "wx/defs.h" +#if wxUSE_CHECKLISTBOX #include "wx/checklst.h" +#ifndef WX_PRECOMP + #include "wx/arrstr.h" +#endif + // ============================================================================ // implementation // ============================================================================ -IMPLEMENT_DYNAMIC_CLASS(wxCheckListBox, wxListBox) - // ---------------------------------------------------------------------------- // implementation of wxCheckListBox class // ---------------------------------------------------------------------------- @@ -48,25 +49,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] ); -} - -static wxString* CopyStringsAddingPrefix(size_t n, const wxString choices[]) -{ - wxString* copy = new wxString[n]; - - for(size_t i = 0; i < n; ++i ) - copy[i] = Prefix(FALSE) + choices[i]; - - return copy; -} - // def ctor: use Create() to really create the control wxCheckListBox::wxCheckListBox() : wxCheckListBoxBase() { @@ -84,6 +66,17 @@ wxCheckListBox::wxCheckListBox(wxWindow *parent, wxWindowID id, style, val, name); } +wxCheckListBox::wxCheckListBox(wxWindow *parent, wxWindowID id, + const wxPoint& pos, const wxSize& size, + const wxArrayString& choices, + long style, const wxValidator& val, + const wxString& name) + : wxCheckListBoxBase() +{ + Create(parent, id, pos, size, choices, + style, val, name); +} + bool wxCheckListBox::Create(wxWindow *parent, wxWindowID id, const wxPoint& pos, const wxSize& size, @@ -92,22 +85,35 @@ bool wxCheckListBox::Create(wxWindow *parent, wxWindowID id, const wxValidator& validator, const wxString& name) { - wxString* chs = CopyStringsAddingPrefix(n, choices); - bool retVal = wxListBox::Create(parent, id, pos, size, n, chs, + // wxListBox::Create calls set, which adds the prefixes + bool retVal = wxListBox::Create(parent, id, pos, size, n, choices, + style, validator, name); + return retVal; +} + +bool wxCheckListBox::Create(wxWindow *parent, wxWindowID id, + const wxPoint& pos, + const wxSize& size, + const wxArrayString& choices, + long style, + const wxValidator& validator, + const wxString& name) +{ + // wxListBox::Create calls set, which adds the prefixes + bool retVal = wxListBox::Create(parent, id, pos, size, choices, style, validator, name); - delete[] chs; return retVal; -} +} // check items // ----------- -bool wxCheckListBox::IsChecked(size_t uiIndex) const +bool wxCheckListBox::IsChecked(unsigned int uiIndex) const { return ::IsChecked(wxListBox::GetString(uiIndex)); } -void wxCheckListBox::Check(size_t uiIndex, bool bCheck) +void wxCheckListBox::Check(unsigned int uiIndex, bool bCheck) { wxString label = wxListBox::GetString(uiIndex); if(::IsChecked(label) == bCheck) return; @@ -117,7 +123,7 @@ void wxCheckListBox::Check(size_t 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; @@ -128,24 +134,19 @@ void wxCheckListBox::DoToggleItem( int n, int x ) event.SetClientObject( GetClientObject(n) ); else if( HasClientUntypedData() ) event.SetClientData( GetClientData(n) ); - event.m_commandInt = n; - event.m_extraLong = TRUE; + event.SetInt(n); + event.SetExtraLong(true); event.SetEventObject(this); - event.SetString( GetString( n ) ); + 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) const +int wxCheckListBox::FindString(const wxString& s, bool bCase) const { - int n1 = wxListBox::FindString(Prefix(FALSE) + s); - int n2 = wxListBox::FindString(Prefix(TRUE) + s); + int n1 = wxListBox::FindString(Prefix(false) + s, bCase); + int n2 = wxListBox::FindString(Prefix(true) + s, bCase); int min = wxMin(n1, n2), max = wxMax(n1, n2); // why this works: @@ -156,26 +157,26 @@ int wxCheckListBox::FindString(const wxString& s) const return min; } -void wxCheckListBox::SetString(int n, const wxString& s) +void wxCheckListBox::SetString(unsigned int n, const wxString& s) { - wxListBox::SetString( n, Prefix(IsChecked(n)) + s ); + wxListBox::SetString(n, Prefix(IsChecked(n)) + s); } -wxString wxCheckListBox::GetString(int n) const +wxString wxCheckListBox::GetString(unsigned int n) const { return wxListBox::GetString(n).substr(4); } -void wxCheckListBox::DoInsertItems(const wxArrayString& items, 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