X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/5d4b632ba3c0e5e5c43412d2d7a2b485b8fcebf2..6433f6d3165a3f8633f42c59694a9104a7b37a93:/src/os2/checklst.cpp

diff --git a/src/os2/checklst.cpp b/src/os2/checklst.cpp
index e53cf20284..05f0b829f2 100644
--- a/src/os2/checklst.cpp
+++ b/src/os2/checklst.cpp
@@ -44,9 +44,7 @@
 // implementation
 // ============================================================================
 
-#if !USE_SHARED_LIBRARY
   IMPLEMENT_DYNAMIC_CLASS(wxCheckListBox, wxListBox)
-#endif
 
 // ----------------------------------------------------------------------------
 // declaration and implementation of wxCheckListBoxItem class
@@ -260,11 +258,7 @@ wxCheckListBox::wxCheckListBox(wxWindow *parent, wxWindowID id,
                                const wxPoint& pos, const wxSize& size,
                                int nStrings, const wxString choices[],
 #if wxUSE_VALIDATORS
-#  if defined(__VISAGECPP__)
-                               long style, const wxValidator* val,
-#  else
                                long style, const wxValidator& val,
-#  endif
 #endif
                                const wxString& name)
               : wxListBox()
@@ -275,7 +269,7 @@ wxCheckListBox::wxCheckListBox(wxWindow *parent, wxWindowID id,
 
 void wxCheckListBox::Delete(int N)
 {
-    wxCHECK_RET( N >= 0 && N < m_noItems,
+    wxCHECK_RET( N >= 0 && N < m_nNumItems,
                  wxT("invalid index in wxListBox::Delete") );
 
     wxListBox::Delete(N);
@@ -283,12 +277,12 @@ void wxCheckListBox::Delete(int N)
     // free memory
     delete m_aItems[N];
 
-    m_aItems.Remove(N);
+    m_aItems.RemoveAt(N);
 }
 
 void wxCheckListBox::InsertItems(int nItems, const wxString items[], int pos)
 {
-    wxCHECK_RET( pos >= 0 && pos <= m_noItems,
+    wxCHECK_RET( pos >= 0 && pos <= m_nNumItems,
                  wxT("invalid index in wxCheckListBox::InsertItems") );
 
     wxListBox::InsertItems(nItems, items, pos);
@@ -383,7 +377,7 @@ void wxCheckListBox::OnLeftClick(wxMouseEvent& event)
 */
     size_t nItem = 0;
 
-    if ( nItem < (size_t)m_noItems )
+    if ( nItem < (size_t)m_nNumItems )
       GetItem(nItem)->Toggle();
     //else: it's not an error, just click outside of client zone
   }