X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/655719367ac5e131d9642e5783f3ecf64d1a3385..c6a6bbbf637a5a580b7ab182483d27522f5e3189:/src/common/lboxcmn.cpp?ds=sidebyside

diff --git a/src/common/lboxcmn.cpp b/src/common/lboxcmn.cpp
index a591f21db2..218ba8a71a 100644
--- a/src/common/lboxcmn.cpp
+++ b/src/common/lboxcmn.cpp
@@ -1,5 +1,5 @@
 ///////////////////////////////////////////////////////////////////////////////
-// Name:        common/lboxcmn.cpp
+// Name:        src/common/lboxcmn.cpp
 // Purpose:     wxListBox class methods common to all platforms
 // Author:      Vadim Zeitlin
 // Modified by:
@@ -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"
 
@@ -30,8 +26,9 @@
 
 #if wxUSE_LISTBOX
 
+#include "wx/listbox.h"
+
 #ifndef WX_PRECOMP
-    #include "wx/listbox.h"
     #include "wx/dynarray.h"
     #include "wx/arrstr.h"
 #endif
@@ -49,10 +46,10 @@ wxListBoxBase::~wxListBoxBase()
 // adding items
 // ----------------------------------------------------------------------------
 
-void wxListBoxBase::InsertItems(int nItems, const wxString *items, int pos)
+void wxListBoxBase::InsertItems(unsigned int nItems, const wxString *items, unsigned int pos)
 {
     wxArrayString aItems;
-    for ( int n = 0; n < nItems; n++ )
+    for ( unsigned int n = 0; n < nItems; n++ )
     {
         aItems.Add(items[n]);
     }
@@ -78,13 +75,13 @@ 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,
-                 wxT("invalid string in SetStringSelection") );
+    const int sel = FindString(s);
+    if ( sel == wxNOT_FOUND )
+        return false;
 
     SetSelection(sel, select);
 
-    return TRUE;
+    return true;
 }
 
 void wxListBoxBase::DeselectAll(int itemToLeaveSelected)
@@ -105,7 +102,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 +115,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 +127,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);
 }