Don't do the wx cleanup if wxPython didn't do the initialization.

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

diff --git a/src/msw/checklst.cpp b/src/msw/checklst.cpp
index 808a4b4f7fbe45b1b260740867aa7c45112b1335..67c6494df89bf47d3926afbff1bcd0eb83974ae9 100644 (file)
--- a/src/msw/checklst.cpp
+++ b/src/msw/checklst.cpp
@@ -45,7 +45,7 @@
 #include <windows.h>
 #include <windowsx.h>
 
 #include <windows.h>
 #include <windowsx.h>
 

-#ifdef __GNUWIN32_OLD__
+#if defined(__GNUWIN32_OLD__)

     #include "wx/msw/gnuwin32/extra.h"
 #endif
 
     #include "wx/msw/gnuwin32/extra.h"
 #endif
 


@@ -60,7 +60,7 @@
 // implementation
 // ============================================================================
 
 // implementation
 // ============================================================================
 

-  IMPLEMENT_DYNAMIC_CLASS(wxCheckListBox, wxListBox)
+IMPLEMENT_DYNAMIC_CLASS(wxCheckListBox, wxListBox)

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


@@ -296,29 +296,9 @@ 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)
-{
-    wxCHECK_RET( pos >= 0 && pos <= m_noItems,
-                 wxT("invalid index in wxCheckListBox::InsertItems") );
-
-    wxListBox::InsertItems(nItems, items, pos);
-
-    int i;
-    for ( i = 0; i < nItems; i++ ) {
-        wxOwnerDrawn *pNewItem = CreateItem((size_t)(pos + i));
-        pNewItem->SetName(items[i]);
-        pNewItem->SetFont(GetFont());
-
-        m_aItems.Insert(pNewItem, (size_t)(pos + i));
-
-        ListBox_SetItemData((HWND)GetHWND(), i + pos, pNewItem);
-    }
-}
-
-

 bool wxCheckListBox::SetFont( const wxFont &font )
 {
     size_t i;
 bool wxCheckListBox::SetFont( const wxFont &font )
 {
     size_t i;