X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/77ffb5937e89927b621128789401db8921fe580f..02bcd285fac7124a41292d905609220005f51087:/src/common/lboxcmn.cpp diff --git a/src/common/lboxcmn.cpp b/src/common/lboxcmn.cpp index 3678abc248..3943d96c4a 100644 --- a/src/common/lboxcmn.cpp +++ b/src/common/lboxcmn.cpp @@ -6,7 +6,7 @@ // Created: 22.10.99 // RCS-ID: $Id$ // Copyright: (c) wxWidgets team -// Licence: wxWidgets licence +// Licence: wxWindows licence /////////////////////////////////////////////////////////////////////////////// // ============================================================================ @@ -17,10 +17,6 @@ // headers // ---------------------------------------------------------------------------- -#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) - #pragma implementation "listboxbase.h" -#endif - // For compilers that support precompilation, includes "wx.h". #include "wx/wxprec.h" @@ -79,12 +75,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 +101,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 +114,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 +126,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); }