adjusting to changed ownership (font is only created in the GetFont call of wxTextAttr)

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

diff --git a/src/os2/checklst.cpp b/src/os2/checklst.cpp
index 3bb67b387b54e44cf895cbfcefce7e07bc4458bc..bda47bb7d17cd1cdd63019974cf65bb4fa86d951 100644 (file)
--- a/src/os2/checklst.cpp
+++ b/src/os2/checklst.cpp
@@ -18,18 +18,23 @@
 
 #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/os2/dc.h"
+#include "wx/ownerdrw.h"

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


@@ -58,9 +63,7 @@ public:
     //
     // ctor
     //
     //
     // ctor
     //

-    wxCheckListBoxItem( wxCheckListBox* pParent,
-                        size_t          nIndex
-                      );
+    wxCheckListBoxItem(wxCheckListBox* pParent, size_t nIndex);

 
     //
     // Drawing functions
 
     //
     // Drawing functions


@@ -86,8 +89,7 @@ private:
 
 
 
 
 
 

-wxCheckListBoxItem::wxCheckListBoxItem ( wxCheckListBox* pParent,
-                                         size_t nIndex)
+wxCheckListBoxItem::wxCheckListBoxItem(wxCheckListBox* pParent, size_t nIndex)

                    :wxOwnerDrawn( wxEmptyString, true /* checkable */ )
 {
     m_bChecked = false;
                    :wxOwnerDrawn( wxEmptyString, true /* checkable */ )
 {
     m_bChecked = false;


@@ -111,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);
 


@@ -166,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,


@@ -184,7 +188,7 @@ bool wxCheckListBoxItem::OnDrawItem ( wxDC& rDc,
 //
 // Change the state of the item and redraw it
 //
 //
 // Change the state of the item and redraw it
 //

-void wxCheckListBoxItem::Check ( bool bCheck )
+void wxCheckListBoxItem::Check( bool bCheck )

 {
     m_bChecked = bCheck;
 
 {
     m_bChecked = bCheck;
 


@@ -270,7 +274,7 @@ wxCheckListBox::wxCheckListBox ( wxWindow* pParent,
             lStyle | wxLB_OWNERDRAW, rVal, rsName );
 } // end of wxCheckListBox::wxCheckListBox
 
             lStyle | wxLB_OWNERDRAW, rVal, rsName );
 } // end of wxCheckListBox::wxCheckListBox
 

-void wxCheckListBox::Delete( int n )
+void wxCheckListBox::Delete(unsigned int n)

 {
     wxCHECK_RET( IsValid(n),
                  wxT("invalid index in wxCheckListBox::Delete") );
 {
     wxCHECK_RET( IsValid(n),
                  wxT("invalid index in wxCheckListBox::Delete") );


@@ -283,12 +287,15 @@ void wxCheckListBox::Delete( int n )
     m_aItems.RemoveAt(n);
 } // end of wxCheckListBox::Delete
 
     m_aItems.RemoveAt(n);
 } // end of wxCheckListBox::Delete
 

-void wxCheckListBox::DoInsertItems(const wxArrayString& items, 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 n = items.GetCount();
-    for (int i = 0; i < n; i++)
+    int result = wxListBox::DoInsertItems( items, pos, clientData, type );
+    unsigned int n = items.GetCount();
+    for (unsigned int i = 0; i < n; i++)

     {
         wxOwnerDrawn* pNewItem = CreateItem((size_t)(pos + i));
 
     {
         wxOwnerDrawn* pNewItem = CreateItem((size_t)(pos + i));
 


@@ -300,11 +307,12 @@ void wxCheckListBox::DoInsertItems(const wxArrayString& items, 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 )
 {

-    for (size_t i = 0; i < m_aItems.GetCount(); i++)
+    for (unsigned int i = 0; i < m_aItems.GetCount(); i++)

         m_aItems[i]->SetFont(rFont);
     wxListBox::SetFont(rFont);
     return true;
         m_aItems[i]->SetFont(rFont);
     wxListBox::SetFont(rFont);
     return true;


@@ -320,7 +328,7 @@ bool wxCheckListBox::SetFont ( const wxFont& rFont )
 //
 // Create a check list box item
 //
 //
 // Create a check list box item
 //

-wxOwnerDrawn* wxCheckListBox::CreateItem ( size_t nIndex )
+wxOwnerDrawn* wxCheckListBox::CreateItem(size_t nIndex)

 {
     wxCheckListBoxItem* pItem = new wxCheckListBoxItem( this, nIndex );
     return pItem;
 {
     wxCheckListBoxItem* pItem = new wxCheckListBoxItem( this, nIndex );
     return pItem;


@@ -360,12 +368,12 @@ long wxCheckListBox::OS2OnMeasure ( WXMEASUREITEMSTRUCT* pItem )
 // Check items
 // -----------
 //
 // Check items
 // -----------
 //

-bool wxCheckListBox::IsChecked ( size_t uiIndex) const
+bool wxCheckListBox::IsChecked(unsigned int uiIndex) const

 {
     return GetItem(uiIndex)->IsChecked();
 } // end of wxCheckListBox::IsChecked
 
 {
     return GetItem(uiIndex)->IsChecked();
 } // end of wxCheckListBox::IsChecked
 

-void wxCheckListBox::Check ( size_t uiIndex, bool bCheck )
+void wxCheckListBox::Check(unsigned int uiIndex, bool bCheck)

 {
     GetItem(uiIndex)->Check(bCheck);
 } // end of wxCheckListBox::Check
 {
     GetItem(uiIndex)->Check(bCheck);
 } // end of wxCheckListBox::Check