merged MapBitmap() from 2.2 branch

[wxWidgets.git] / src / os2 / checklst.cpp

diff --git a/src/os2/checklst.cpp b/src/os2/checklst.cpp
index e53cf202841a4c493f8de6870c3462bb20bd8466..366f87d7f89d8bcbb6d320c2011ab80229eba532 100644 (file)
--- 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()
@@ -283,7 +277,7 @@ 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)