compilation fix for wxOSX_USE_EXPERIMENTAL_FONTDIALOG==0 (closes #10834)

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

diff --git a/src/os2/checklst.cpp b/src/os2/checklst.cpp
index 8491b44200fb3a4e5943ab06e79faca9f0794c4c..f0a3ac723bc88e2b18527d57b4a673e2849e5885 100644 (file)
--- a/src/os2/checklst.cpp
+++ b/src/os2/checklst.cpp
@@ -33,6 +33,7 @@
     #include "wx/font.h"
 #endif
 
     #include "wx/font.h"
 #endif
 

+#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,25 +287,6 @@ 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)
-{
-    // pos is validated in wxListBox
-    wxListBox::DoInsertItems( items, pos );
-    unsigned int n = items.GetCount();
-    for (unsigned int i = 0; i < n; i++)
-    {
-        wxOwnerDrawn* pNewItem = CreateItem((size_t)(pos + i));
-
-        pNewItem->SetName(items[i]);
-        m_aItems.Insert(pNewItem, (size_t)(pos + i));
-        ::WinSendMsg( (HWND)GetHWND(),
-                      LM_SETITEMHANDLE,
-                      (MPARAM)(i + pos),
-                      MPFROMP(pNewItem)
-                    );
-    }
-} // end of wxCheckListBox::InsertItems
-

 bool wxCheckListBox::SetFont ( const wxFont& rFont )
 {
     for (unsigned int i = 0; i < m_aItems.GetCount(); i++)
 bool wxCheckListBox::SetFont ( const wxFont& rFont )
 {
     for (unsigned int i = 0; i < m_aItems.GetCount(); i++)