Compile fix when not using WXR resources.

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

diff --git a/src/os2/checklst.cpp b/src/os2/checklst.cpp
index 654dc3a1fc5be1ec01c0b3e638f375644fc910d8..05f0b829f2c42b8725e93723407e5a3e70ad2f8b 100644 (file)
--- a/src/os2/checklst.cpp
+++ b/src/os2/checklst.cpp
@@ -44,9 +44,7 @@
 // implementation
 // ============================================================================
 
 // implementation
 // ============================================================================
 

-#if !USE_SHARED_LIBRARY

   IMPLEMENT_DYNAMIC_CLASS(wxCheckListBox, wxListBox)
   IMPLEMENT_DYNAMIC_CLASS(wxCheckListBox, wxListBox)

-#endif

 
 // ----------------------------------------------------------------------------
 // declaration and implementation of wxCheckListBoxItem class
 
 // ----------------------------------------------------------------------------
 // declaration and implementation of wxCheckListBoxItem class


@@ -259,7 +257,9 @@ wxCheckListBox::wxCheckListBox() : wxListBox()
 wxCheckListBox::wxCheckListBox(wxWindow *parent, wxWindowID id,
                                const wxPoint& pos, const wxSize& size,
                                int nStrings, const wxString choices[],
 wxCheckListBox::wxCheckListBox(wxWindow *parent, wxWindowID id,
                                const wxPoint& pos, const wxSize& size,
                                int nStrings, const wxString choices[],

+#if wxUSE_VALIDATORS

                                long style, const wxValidator& val,
                                long style, const wxValidator& val,

+#endif

                                const wxString& name)
               : wxListBox()
 {
                                const wxString& name)
               : wxListBox()
 {


@@ -269,7 +269,7 @@ wxCheckListBox::wxCheckListBox(wxWindow *parent, wxWindowID id,
 
 void wxCheckListBox::Delete(int N)
 {
 
 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);
                  wxT("invalid index in wxListBox::Delete") );
 
     wxListBox::Delete(N);


@@ -277,12 +277,12 @@ void wxCheckListBox::Delete(int N)
     // free memory
     delete m_aItems[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)
 {
 }
 
 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);
                  wxT("invalid index in wxCheckListBox::InsertItems") );
 
     wxListBox::InsertItems(nItems, items, pos);


@@ -377,7 +377,7 @@ void wxCheckListBox::OnLeftClick(wxMouseEvent& event)
 */
     size_t nItem = 0;
 
 */
     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
   }
       GetItem(nItem)->Toggle();
     //else: it's not an error, just click outside of client zone
   }