X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/655719367ac5e131d9642e5783f3ecf64d1a3385..7d3e806d86a159f3af1db1744a75de162e0e1a8d:/src/common/lboxcmn.cpp diff --git a/src/common/lboxcmn.cpp b/src/common/lboxcmn.cpp index a591f21db2..1ded1f2bb5 100644 --- a/src/common/lboxcmn.cpp +++ b/src/common/lboxcmn.cpp @@ -79,12 +79,12 @@ void wxListBoxBase::Set(int nItems, const wxString* items, void **clientData) bool wxListBoxBase::SetStringSelection(const wxString& s, bool select) { int sel = FindString(s); - wxCHECK_MSG( sel != -1, FALSE, + wxCHECK_MSG( sel != wxNOT_FOUND, false, wxT("invalid string in SetStringSelection") ); SetSelection(sel, select); - return TRUE; + return true; } void wxListBoxBase::DeselectAll(int itemToLeaveSelected) @@ -105,7 +105,7 @@ void wxListBoxBase::DeselectAll(int itemToLeaveSelected) else // single selection { int sel = GetSelection(); - if ( sel != -1 && sel != itemToLeaveSelected ) + if ( sel != wxNOT_FOUND && sel != itemToLeaveSelected ) { Deselect(sel); } @@ -118,7 +118,7 @@ void wxListBoxBase::DeselectAll(int itemToLeaveSelected) void wxListBoxBase::Command(wxCommandEvent& event) { - SetSelection(event.m_commandInt, event.m_extraLong != 0); + SetSelection(event.GetInt(), event.GetExtraLong() != 0); (void)ProcessEvent(event); } @@ -130,7 +130,7 @@ void wxListBoxBase::SetFirstItem(const wxString& s) { int n = FindString(s); - wxCHECK_RET( n != -1, wxT("invalid string in wxListBox::SetFirstItem") ); + wxCHECK_RET( n != wxNOT_FOUND, wxT("invalid string in wxListBox::SetFirstItem") ); DoSetFirstItem(n); }