a tad bit more padding

[wxWidgets.git] / src / common / lboxcmn.cpp

diff --git a/src/common/lboxcmn.cpp b/src/common/lboxcmn.cpp
index 3943d96c4a2aabf4d1bd414388ff9e3e346fb486..218ba8a71adf0459c32c3aad7dcc955f01d43aac 100644 (file)
--- 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:
 // Purpose:     wxListBox class methods common to all platforms
 // Author:      Vadim Zeitlin
 // Modified by:


@@ -26,8 +26,9 @@
 
 #if wxUSE_LISTBOX
 
 
 #if wxUSE_LISTBOX
 

+#include "wx/listbox.h"
+

 #ifndef WX_PRECOMP
 #ifndef WX_PRECOMP

-    #include "wx/listbox.h"

     #include "wx/dynarray.h"
     #include "wx/arrstr.h"
 #endif
     #include "wx/dynarray.h"
     #include "wx/arrstr.h"
 #endif


@@ -45,10 +46,10 @@ wxListBoxBase::~wxListBoxBase()
 // adding items
 // ----------------------------------------------------------------------------
 
 // 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;
 {
     wxArrayString aItems;

-    for ( int n = 0; n < nItems; n++ )
+    for ( unsigned int n = 0; n < nItems; n++ )

     {
         aItems.Add(items[n]);
     }
     {
         aItems.Add(items[n]);
     }


@@ -74,9 +75,9 @@ void wxListBoxBase::Set(int nItems, const wxString* items, void **clientData)
 
 bool wxListBoxBase::SetStringSelection(const wxString& s, bool select)
 {
 
 bool wxListBoxBase::SetStringSelection(const wxString& s, bool select)
 {

-    int sel = FindString(s);
-    wxCHECK_MSG( sel != wxNOT_FOUND, false,
-                 wxT("invalid string in SetStringSelection") );
+    const int sel = FindString(s);
+    if ( sel == wxNOT_FOUND )
+        return false;

 
     SetSelection(sel, select);
 
 
     SetSelection(sel, select);