Avoid clash with control container event handlers

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

diff --git a/src/os2/checklst.cpp b/src/os2/checklst.cpp
index 8d2d55ee5526e3915e268828378d2ecbd1d8d5af..c32fc84787a593b1cb7709dcd65b4607e41d69a4 100644 (file)
--- a/src/os2/checklst.cpp
+++ b/src/os2/checklst.cpp
@@ -18,18 +18,22 @@
 
 #if wxUSE_CHECKLISTBOX && wxUSE_OWNER_DRAWN
 
 
 #if wxUSE_CHECKLISTBOX && wxUSE_OWNER_DRAWN
 

-#include "wx/object.h"
-#include "wx/colour.h"
-#include "wx/font.h"
-#include "wx/bitmap.h"
-#include "wx/window.h"
-#include "wx/listbox.h"
-#include "wx/ownerdrw.h"
-#include "wx/settings.h"
-#include "wx/dcmemory.h"
-#include "wx/dcscreen.h"

 #include "wx/checklst.h"
 #include "wx/checklst.h"

-#include "wx/log.h"
+
+#ifndef WX_PRECOMP
+    #include "wx/object.h"
+    #include "wx/log.h"
+    #include "wx/window.h"
+    #include "wx/dcmemory.h"
+    #include "wx/dcscreen.h"
+    #include "wx/settings.h"
+    #include "wx/listbox.h"
+    #include "wx/bitmap.h"
+    #include "wx/colour.h"
+    #include "wx/font.h"
+#endif
+
+#include "wx/ownerdrw.h"

 
 #define INCL_PM
 #include <os2.h>
 
 #define INCL_PM
 #include <os2.h>


@@ -280,10 +284,13 @@ void wxCheckListBox::Delete(unsigned int n)
     m_aItems.RemoveAt(n);
 } // end of wxCheckListBox::Delete
 
     m_aItems.RemoveAt(n);
 } // end of wxCheckListBox::Delete
 

-void wxCheckListBox::DoInsertItems(const wxArrayString& items, unsigned int pos)
+int wxCheckListBox::DoInsertItems(const wxArrayStringsAdapter& items,
+                                  unsigned int pos,
+                                  void **clientData,
+                                  wxClientDataType type)

 {
     // pos is validated in wxListBox
 {
     // pos is validated in wxListBox

-    wxListBox::DoInsertItems( items, pos );
+    int result = wxListBox::DoInsertItems( items, pos, clientData, type );

     unsigned int n = items.GetCount();
     for (unsigned int i = 0; i < n; i++)
     {
     unsigned int n = items.GetCount();
     for (unsigned int i = 0; i < n; i++)
     {


@@ -297,7 +304,8 @@ void wxCheckListBox::DoInsertItems(const wxArrayString& items, unsigned int pos)
                       MPFROMP(pNewItem)
                     );
     }
                       MPFROMP(pNewItem)
                     );
     }

-} // end of wxCheckListBox::InsertItems
+    return result;
+} // end of wxCheckListBox::DoInsertItems

 
 bool wxCheckListBox::SetFont ( const wxFont& rFont )
 {
 
 bool wxCheckListBox::SetFont ( const wxFont& rFont )
 {