no real changes, just some minor cleanup to fix a few compile- and run-time warnings...

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

diff --git a/src/os2/checklst.cpp b/src/os2/checklst.cpp
index 4be739ef637c8f5340c548aa996909cb39a00f33..bda47bb7d17cd1cdd63019974cf65bb4fa86d951 100644 (file)
--- a/src/os2/checklst.cpp
+++ b/src/os2/checklst.cpp
@@ -27,12 +27,13 @@
     #include "wx/dcmemory.h"
     #include "wx/dcscreen.h"
     #include "wx/settings.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
 
 #endif
 

-#include "wx/colour.h"
-#include "wx/font.h"
-#include "wx/bitmap.h"
-#include "wx/listbox.h"
+#include "wx/os2/dc.h"

 #include "wx/ownerdrw.h"
 
 #define INCL_PM
 #include "wx/ownerdrw.h"
 
 #define INCL_PM


@@ -112,7 +113,9 @@ bool wxCheckListBoxItem::OnDrawItem ( wxDC& rDc,
 {
     wxRect vRect = rRect;
 
 {
     wxRect vRect = rRect;
 

-    ::WinQueryWindowRect( m_pParent->GetHWND(), &rDc.m_vRclPaint );
+
+    wxPMDCImpl *impl = (wxPMDCImpl*) rDc.GetImpl();
+    ::WinQueryWindowRect( m_pParent->GetHWND(), &impl->m_vRclPaint );

     if (IsChecked())
         eStat = (wxOwnerDrawn::wxODStatus)(eStat | wxOwnerDrawn::wxODChecked);
 
     if (IsChecked())
         eStat = (wxOwnerDrawn::wxODStatus)(eStat | wxOwnerDrawn::wxODChecked);
 


@@ -167,8 +170,8 @@ bool wxCheckListBoxItem::OnDrawItem ( wxDC& rDc,
             //
             HBITMAP hChkBmp = ::WinGetSysBitmap( HWND_DESKTOP, SBMP_MENUCHECK );
             POINTL  vPoint = {nX, nOldY + 3};
             //
             HBITMAP hChkBmp = ::WinGetSysBitmap( HWND_DESKTOP, SBMP_MENUCHECK );
             POINTL  vPoint = {nX, nOldY + 3};

-
-            ::WinDrawBitmap( rDc.GetHPS(),
+            wxPMDCImpl *impl = (wxPMDCImpl*) rDc.GetImpl();
+            ::WinDrawBitmap( impl->GetHPS(),

                              hChkBmp,
                              NULL,
                              &vPoint,
                              hChkBmp,
                              NULL,
                              &vPoint,


@@ -284,10 +287,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++)
     {


@@ -301,7 +307,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 )
 {