compilation fix for !wxUSE_ON_FATAL_EXCEPTION

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

diff --git a/src/common/lboxcmn.cpp b/src/common/lboxcmn.cpp
index 3678abc248a61ce76a3fba50c0830ab7a4c3066e..1ded1f2bb5453b6b6a086fdfe4e0fadc9876b3ae 100644 (file)
--- 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
 // Created:     22.10.99
 // RCS-ID:      $Id$
 // Copyright:   (c) wxWidgets team

-// Licence:     wxWidgets licence
+// Licence:     wxWindows licence

 ///////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================
 ///////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================


@@ -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);
 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);
 
                  wxT("invalid string in SetStringSelection") );
 
     SetSelection(sel, select);
 

-    return TRUE;
+    return true;

 }
 
 void wxListBoxBase::DeselectAll(int itemToLeaveSelected)
 }
 
 void wxListBoxBase::DeselectAll(int itemToLeaveSelected)


@@ -105,7 +105,7 @@ void wxListBoxBase::DeselectAll(int itemToLeaveSelected)
     else // single selection
     {
         int sel = GetSelection();
     else // single selection
     {
         int sel = GetSelection();

-        if ( sel != -1 && sel != itemToLeaveSelected )
+        if ( sel != wxNOT_FOUND && sel != itemToLeaveSelected )

         {
             Deselect(sel);
         }
         {
             Deselect(sel);
         }


@@ -118,7 +118,7 @@ void wxListBoxBase::DeselectAll(int itemToLeaveSelected)
 
 void wxListBoxBase::Command(wxCommandEvent& event)
 {
 
 void wxListBoxBase::Command(wxCommandEvent& event)
 {

-    SetSelection(event.m_commandInt, event.m_extraLong != 0);
+    SetSelection(event.GetInt(), event.GetExtraLong() != 0);

     (void)ProcessEvent(event);
 }
 
     (void)ProcessEvent(event);
 }
 


@@ -130,7 +130,7 @@ void wxListBoxBase::SetFirstItem(const wxString& s)
 {
     int n = FindString(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);
 }
 
     DoSetFirstItem(n);
 }