Fixed OS/2 compilation after wxDC changes

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@51290 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/src/generic/statusbr.cpp b/src/generic/statusbr.cpp
index 96b845a3bb97dc1082c9b722a1c8afcda52eaa70..182b0db362135a360bdbaa98133eeb26a8d830e3 100644 (file)
--- a/src/generic/statusbr.cpp
+++ b/src/generic/statusbr.cpp
@@ -241,13 +241,6 @@ void wxStatusBarGeneric::OnPaint(wxPaintEvent& WXUNUSED(event) )
 
     dc.SetBackgroundMode(wxTRANSPARENT);
 
 
     dc.SetBackgroundMode(wxTRANSPARENT);
 

-#ifdef __WXPM__
-    wxColour vColor;
-
-    vColor = wxSystemSettings::GetColour(wxSYS_COLOUR_MENUBAR);
-    ::WinFillRect(dc.m_hPS, &dc.m_vRclPaint, vColor.GetPixel());
-#endif
-

     for (int i = 0; i < m_nFields; i ++)
         DrawField(dc, i);
 }
     for (int i = 0; i < m_nFields; i ++)
         DrawField(dc, i);
 }

diff --git a/src/os2/bmpbuttn.cpp b/src/os2/bmpbuttn.cpp
index 6bd9f2955769e14dc8eacb6ffc7bf9e105f5fa70..bfaf5a7217e0548f579ebb6e77a177eae53bf93c 100644 (file)
--- a/src/os2/bmpbuttn.cpp
+++ b/src/os2/bmpbuttn.cpp
@@ -19,6 +19,7 @@
 #ifndef WX_PRECOMP
 #endif
 
 #ifndef WX_PRECOMP
 #endif
 

+#include "wx/os2/dcclient.h"

 #include "wx/os2/private.h"
 
 
 #include "wx/os2/private.h"
 
 


@@ -129,8 +130,9 @@ bool wxBitmapButton::OS2OnDraw( WXDRAWITEMSTRUCT* pItem)
     //
     int                             nX1        = 0;
     int                             nY1        = 0;
     //
     int                             nX1        = 0;
     int                             nY1        = 0;

-    int                             nWidth     = vDc.m_vRclPaint.xRight - vDc.m_vRclPaint.xLeft;
-    int                             nHeight    = vDc.m_vRclPaint.yTop - vDc.m_vRclPaint.yBottom;
+    wxPMDCImpl                      *impl = (wxPMDCImpl*) vDc.GetImpl();
+    int                             nWidth     = impl->m_vRclPaint.xRight - impl->m_vRclPaint.xLeft;
+    int                             nHeight    = impl->m_vRclPaint.yTop - impl->m_vRclPaint.yBottom;

     int                             nBmpWidth  = pBitmap->GetWidth();
     int                             nBmpHeight = pBitmap->GetHeight();
 
     int                             nBmpWidth  = pBitmap->GetWidth();
     int                             nBmpHeight = pBitmap->GetHeight();
 


@@ -189,31 +191,32 @@ void wxBitmapButton::DrawFace (wxClientDC& rDC, bool bSel)
     // Note: DrawLine expects wxWidgets coordinate system so swap
     //
     rDC.SetPen(bSel ? vDarkShadowPen : vHiLitePen);
     // Note: DrawLine expects wxWidgets coordinate system so swap
     //
     rDC.SetPen(bSel ? vDarkShadowPen : vHiLitePen);

+    wxPMDCImpl                      *impl = (wxPMDCImpl*) rDC.GetImpl();

     // top
     // top

-    rDC.DrawLine( rDC.m_vRclPaint.xLeft + 1
-                 ,rDC.m_vRclPaint.yBottom + 1
-                 ,rDC.m_vRclPaint.xRight - 1
-                 ,rDC.m_vRclPaint.yBottom + 1
+    rDC.DrawLine( impl->m_vRclPaint.xLeft + 1
+                 ,impl->m_vRclPaint.yBottom + 1
+                 ,impl->m_vRclPaint.xRight - 1
+                 ,impl->m_vRclPaint.yBottom + 1

                 );
     // left
                 );
     // left

-    rDC.DrawLine( rDC.m_vRclPaint.xLeft + 1
-                 ,rDC.m_vRclPaint.yBottom + 1
-                 ,rDC.m_vRclPaint.xLeft + 1
-                 ,rDC.m_vRclPaint.yTop - 1
+    rDC.DrawLine( impl->m_vRclPaint.xLeft + 1
+                 ,impl->m_vRclPaint.yBottom + 1
+                 ,impl->m_vRclPaint.xLeft + 1
+                 ,impl->m_vRclPaint.yTop - 1

                 );
 
     rDC.SetPen(bSel ? vHiLitePen : vDarkShadowPen);
     // bottom
                 );
 
     rDC.SetPen(bSel ? vHiLitePen : vDarkShadowPen);
     // bottom

-    rDC.DrawLine( rDC.m_vRclPaint.xLeft + 1
-                 ,rDC.m_vRclPaint.yTop - 1
-                 ,rDC.m_vRclPaint.xRight - 1
-                 ,rDC.m_vRclPaint.yTop - 1
+    rDC.DrawLine( impl->m_vRclPaint.xLeft + 1
+                 ,impl->m_vRclPaint.yTop - 1
+                 ,impl->m_vRclPaint.xRight - 1
+                 ,impl->m_vRclPaint.yTop - 1

                 );
     // right
                 );
     // right

-    rDC.DrawLine( rDC.m_vRclPaint.xRight - 1
-                 ,rDC.m_vRclPaint.yBottom + 1
-                 ,rDC.m_vRclPaint.xRight - 1
-                 ,rDC.m_vRclPaint.yTop - 1
+    rDC.DrawLine( impl->m_vRclPaint.xRight - 1
+                 ,impl->m_vRclPaint.yBottom + 1
+                 ,impl->m_vRclPaint.xRight - 1
+                 ,impl->m_vRclPaint.yTop - 1

                 );
 
 } // end of wxBitmapButton::DrawFace
                 );
 
 } // end of wxBitmapButton::DrawFace


@@ -229,29 +232,30 @@ void wxBitmapButton::DrawButtonFocus (
     // Note: DrawLine expects wxWidgets coordinate system so swap
     //
     rDC.SetPen(vBlackPen);
     // Note: DrawLine expects wxWidgets coordinate system so swap
     //
     rDC.SetPen(vBlackPen);

+    wxPMDCImpl                      *impl = (wxPMDCImpl*) rDC.GetImpl();

     // top
     // top

-    rDC.DrawLine( rDC.m_vRclPaint.xLeft
-                 ,rDC.m_vRclPaint.yBottom
-                 ,rDC.m_vRclPaint.xRight
-                 ,rDC.m_vRclPaint.yBottom
+    rDC.DrawLine( impl->m_vRclPaint.xLeft
+                 ,impl->m_vRclPaint.yBottom
+                 ,impl->m_vRclPaint.xRight
+                 ,impl->m_vRclPaint.yBottom

                 );
     // right
                 );
     // right

-    rDC.DrawLine( rDC.m_vRclPaint.xRight
-                 ,rDC.m_vRclPaint.yBottom
-                 ,rDC.m_vRclPaint.xRight
-                 ,rDC.m_vRclPaint.yTop
+    rDC.DrawLine( impl->m_vRclPaint.xRight
+                 ,impl->m_vRclPaint.yBottom
+                 ,impl->m_vRclPaint.xRight
+                 ,impl->m_vRclPaint.yTop

                 );
     // bottom
                 );
     // bottom

-    rDC.DrawLine( rDC.m_vRclPaint.xRight
-                 ,rDC.m_vRclPaint.yTop
-                 ,rDC.m_vRclPaint.xLeft
-                 ,rDC.m_vRclPaint.yTop
+    rDC.DrawLine( impl->m_vRclPaint.xRight
+                 ,impl->m_vRclPaint.yTop
+                 ,impl->m_vRclPaint.xLeft
+                 ,impl->m_vRclPaint.yTop

                 );
     // left
                 );
     // left

-    rDC.DrawLine( rDC.m_vRclPaint.xLeft
-                 ,rDC.m_vRclPaint.yTop
-                 ,rDC.m_vRclPaint.xLeft
-                 ,rDC.m_vRclPaint.yBottom
+    rDC.DrawLine( impl->m_vRclPaint.xLeft
+                 ,impl->m_vRclPaint.yTop
+                 ,impl->m_vRclPaint.xLeft
+                 ,impl->m_vRclPaint.yBottom

                 );
 } // end of wxBitmapButton::DrawButtonFocus
 
                 );
 } // end of wxBitmapButton::DrawButtonFocus
 


@@ -265,29 +269,30 @@ void wxBitmapButton::DrawButtonDisable( wxClientDC& rDC,
     // Note: DrawLine expects wxWidgets coordinate system so swap
     //
     rDC.SetPen(vGreyPen);
     // Note: DrawLine expects wxWidgets coordinate system so swap
     //
     rDC.SetPen(vGreyPen);

+    wxPMDCImpl                      *impl = (wxPMDCImpl*) rDC.GetImpl();

     // top
     // top

-    rDC.DrawLine( rDC.m_vRclPaint.xLeft
-                 ,rDC.m_vRclPaint.yBottom
-                 ,rDC.m_vRclPaint.xRight
-                 ,rDC.m_vRclPaint.yBottom
+    rDC.DrawLine( impl->m_vRclPaint.xLeft
+                 ,impl->m_vRclPaint.yBottom
+                 ,impl->m_vRclPaint.xRight
+                 ,impl->m_vRclPaint.yBottom

                 );
     // right
                 );
     // right

-    rDC.DrawLine( rDC.m_vRclPaint.xRight
-                 ,rDC.m_vRclPaint.yBottom
-                 ,rDC.m_vRclPaint.xRight
-                 ,rDC.m_vRclPaint.yTop
+    rDC.DrawLine( impl->m_vRclPaint.xRight
+                 ,impl->m_vRclPaint.yBottom
+                 ,impl->m_vRclPaint.xRight
+                 ,impl->m_vRclPaint.yTop

                 );
     // bottom
                 );
     // bottom

-    rDC.DrawLine( rDC.m_vRclPaint.xRight
-                 ,rDC.m_vRclPaint.yTop
-                 ,rDC.m_vRclPaint.xLeft
-                 ,rDC.m_vRclPaint.yTop
+    rDC.DrawLine( impl->m_vRclPaint.xRight
+                 ,impl->m_vRclPaint.yTop
+                 ,impl->m_vRclPaint.xLeft
+                 ,impl->m_vRclPaint.yTop

                 );
     // left
                 );
     // left

-    rDC.DrawLine( rDC.m_vRclPaint.xLeft
-                 ,rDC.m_vRclPaint.yTop
-                 ,rDC.m_vRclPaint.xLeft
-                 ,rDC.m_vRclPaint.yBottom
+    rDC.DrawLine( impl->m_vRclPaint.xLeft
+                 ,impl->m_vRclPaint.yTop
+                 ,impl->m_vRclPaint.xLeft
+                 ,impl->m_vRclPaint.yBottom

                 );
     wxDisableBitmap(rBmp, vGreyPen.GetColour().GetPixel());
 } // end of wxBitmapButton::DrawButtonDisable
                 );
     wxDisableBitmap(rBmp, vGreyPen.GetColour().GetPixel());
 } // end of wxBitmapButton::DrawButtonDisable

diff --git a/src/os2/checklst.cpp b/src/os2/checklst.cpp
index c32fc84787a593b1cb7709dcd65b4607e41d69a4..bda47bb7d17cd1cdd63019974cf65bb4fa86d951 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,

diff --git a/src/os2/listbox.cpp b/src/os2/listbox.cpp
index e8a6013682dd3f934cf3bab537ba174cff409663..e45ad8414b5978d4ab143a7745ee8c388a58be17 100644 (file)
--- a/src/os2/listbox.cpp
+++ b/src/os2/listbox.cpp
@@ -29,6 +29,7 @@
     #include "wx/window.h"
 #endif
 
     #include "wx/window.h"
 #endif
 

+#include "wx/os2/dcclient.h"

 #include "wx/os2/private.h"
 
 #define INCL_M
 #include "wx/os2/private.h"
 
 #define INCL_M


@@ -738,12 +739,13 @@ bool wxListBox::OS2OnDraw (
 
     wxCHECK(pData, false );
 
 
     wxCHECK(pData, false );
 

-    wxDC    vDc;
+    wxClientDC    vDc(this);
+    wxPMDCImpl *impl = (wxPMDCImpl*) vDc.GetImpl();

     wxPoint pt1( pDrawStruct->rclItem.xLeft, pDrawStruct->rclItem.yTop );
     wxPoint pt2( pDrawStruct->rclItem.xRight, pDrawStruct->rclItem.yBottom );
     wxRect  vRect( pt1, pt2 );
 
     wxPoint pt1( pDrawStruct->rclItem.xLeft, pDrawStruct->rclItem.yTop );
     wxPoint pt2( pDrawStruct->rclItem.xRight, pDrawStruct->rclItem.yBottom );
     wxRect  vRect( pt1, pt2 );
 

-    vDc.SetHPS(pDrawStruct->hps);
+    impl->SetHPS(pDrawStruct->hps);

 
     if (pDrawStruct->fsAttribute == pDrawStruct->fsAttributeOld)
     {
 
     if (pDrawStruct->fsAttribute == pDrawStruct->fsAttributeOld)
     {

diff --git a/src/os2/ownerdrw.cpp b/src/os2/ownerdrw.cpp
index 12790b51ceb709c55bece245e4f9b07bcc1d2e0c..8f7d425b094be7972847ae7dd94ab654a4205d04 100644 (file)
--- a/src/os2/ownerdrw.cpp
+++ b/src/os2/ownerdrw.cpp
@@ -27,6 +27,7 @@
 #endif
 
 #include "wx/ownerdrw.h"
 #endif
 
 #include "wx/ownerdrw.h"

+#include "wx/os2/dcclient.h"

 
 // ============================================================================
 // implementation of wxOwnerDrawn class
 
 // ============================================================================
 // implementation of wxOwnerDrawn class


@@ -78,8 +79,8 @@ bool wxOwnerDrawn::OnMeasureItem( size_t* pWidth,
     }
     vDC.SetFont(GetFont());
     vDC.GetTextExtent( sStr
     }
     vDC.SetFont(GetFont());
     vDC.GetTextExtent( sStr

-                      ,(long *)pWidth
-                      ,(long *)pHeight
+                      ,(wxCoord *)pWidth
+                      ,(wxCoord *)pHeight

                      );
     if (!m_strAccel.empty())
     {
                      );
     if (!m_strAccel.empty())
     {


@@ -155,8 +156,9 @@ bool wxOwnerDrawn::OnMeasureItem( size_t* pWidth,
     // Make sure that this item is at least as
     // tall as the user's system settings specify
     //
     // Make sure that this item is at least as
     // tall as the user's system settings specify
     //

-    if (*pHeight < m_nMinHeight)
-        *pHeight = m_nMinHeight;
+    const size_t heightStd = 6;                 // FIXME: get value from the system
+    if ( *pHeight < heightStd )
+      *pHeight = heightStd;

     m_nHeight = *pHeight;                // remember height for use in OnDrawItem
     return true;
 } // end of wxOwnerDrawn::OnMeasureItem
     m_nHeight = *pHeight;                // remember height for use in OnDrawItem
     return true;
 } // end of wxOwnerDrawn::OnMeasureItem


@@ -179,7 +181,8 @@ bool wxOwnerDrawn::OnDrawItem( wxDC& rDC,
     //
 
     CHARBUNDLE                      vCbnd;
     //
 
     CHARBUNDLE                      vCbnd;

-    HPS                             hPS= rDC.GetHPS();
+    wxPMDCImpl                      *impl = (wxPMDCImpl*) rDC.GetImpl();
+    HPS                             hPS= impl->GetHPS();

     wxColour                        vColBack;
     wxColour                        vColText;
     COLORREF                        vRef;
     wxColour                        vColBack;
     wxColour                        vColText;
     COLORREF                        vRef;


@@ -333,13 +336,13 @@ bool wxOwnerDrawn::OnDrawItem( wxDC& rDC,
         bFoundMnemonic = true;
         sTmp.Remove(nIndex);
         rDC.GetTextExtent( sTmp
         bFoundMnemonic = true;
         sTmp.Remove(nIndex);
         rDC.GetTextExtent( sTmp

-                          ,(long *)&nWidth
-                          ,(long *)&nHeight
+                          ,(wxCoord *)&nWidth
+                          ,(wxCoord *)&nHeight

                          );
         sTmp = sFullString[(size_t)(nIndex + 1)];
         rDC.GetTextExtent( sTmp
                          );
         sTmp = sFullString[(size_t)(nIndex + 1)];
         rDC.GetTextExtent( sTmp

-                          ,(long *)&nCharWidth
-                          ,(long *)&nHeight
+                          ,(wxCoord *)&nCharWidth
+                          ,(wxCoord *)&nHeight

                          );
         sFullString.Replace(sTgt.c_str(), wxEmptyString, true);
     }
                          );
         sFullString.Replace(sTgt.c_str(), wxEmptyString, true);
     }


@@ -348,7 +351,7 @@ bool wxOwnerDrawn::OnDrawItem( wxDC& rDC,
     // Draw the main item text sans the accel text
     //
     POINTL                      vPntStart = {nX, rRect.y + 4};
     // Draw the main item text sans the accel text
     //
     POINTL                      vPntStart = {nX, rRect.y + 4};

-    ::GpiCharStringAt( rDC.GetHPS()
+    ::GpiCharStringAt( impl->GetHPS()

                       ,&vPntStart
                       ,sFullString.length()
                       ,sFullString.char_str()
                       ,&vPntStart
                       ,sFullString.length()
                       ,sFullString.char_str()


@@ -378,15 +381,15 @@ bool wxOwnerDrawn::OnDrawItem( wxDC& rDC,
         size_t                      nHeight;
 
         rDC.GetTextExtent( sAccel
         size_t                      nHeight;
 
         rDC.GetTextExtent( sAccel

-                          ,(long *)&nWidth
-                          ,(long *)&nHeight
+                          ,(wxCoord *)&nWidth
+                          ,(wxCoord *)&nHeight

                          );
         //
         // Back off the starting position from the right edge
         //
         vPntStart.x = rRect.width - (nWidth + 7);
         vPntStart.y = rRect.y + 4;
                          );
         //
         // Back off the starting position from the right edge
         //
         vPntStart.x = rRect.width - (nWidth + 7);
         vPntStart.y = rRect.y + 4;

-        ::GpiCharStringAt( rDC.GetHPS()
+        ::GpiCharStringAt( impl->GetHPS()

                           ,&vPntStart
                           ,sAccel.length()
                           ,sAccel.char_str()
                           ,&vPntStart
                           ,sAccel.length()
                           ,sAccel.char_str()

diff --git a/src/os2/toolbar.cpp b/src/os2/toolbar.cpp
index edc47523742a00dc933c45c68e9640f445885bea..e07ee3e3564bcaff0a98dab1eee6839de13c8335 100644 (file)
--- a/src/os2/toolbar.cpp
+++ b/src/os2/toolbar.cpp
@@ -26,6 +26,7 @@
 #endif
 
 #include "wx/tooltip.h"
 #endif
 
 #include "wx/tooltip.h"

+#include "wx/os2/dcclient.h"

 
 bool wxToolBar::m_bInitialized = false;
 
 
 bool wxToolBar::m_bInitialized = false;
 


@@ -601,7 +602,8 @@ void wxToolBar::OnPaint (
         return;
     nCount++;
 
         return;
     nCount++;
 

-    ::WinFillRect(vDc.GetHPS(), &vDc.m_vRclPaint, GetBackgroundColour().GetPixel());
+    wxPMDCImpl *impl = (wxPMDCImpl*) vDc.GetImpl();
+    ::WinFillRect(impl->GetHPS(), &impl->m_vRclPaint, GetBackgroundColour().GetPixel());

     for ( wxToolBarToolsList::compatibility_iterator node = m_tools.GetFirst();
           node;
           node = node->GetNext() )
     for ( wxToolBarToolsList::compatibility_iterator node = m_tools.GetFirst();
           node;
           node = node->GetNext() )

diff --git a/src/os2/window.cpp b/src/os2/window.cpp
index f5c84cb9391ce28aeb816ae0b0569a32429c6f56..4a631a84520a848d5b4aa7094c52b4ec9edeb564 100644 (file)
--- a/src/os2/window.cpp
+++ b/src/os2/window.cpp
@@ -51,6 +51,8 @@
     #include <stdio.h>
 #endif
 
     #include <stdio.h>
 #endif
 

+#include "wx/os2/dcclient.h"
+

 #if wxUSE_OWNER_DRAWN
     #include "wx/ownerdrw.h"
 #endif
 #if wxUSE_OWNER_DRAWN
     #include "wx/ownerdrw.h"
 #endif


@@ -121,7 +123,7 @@
 QMSG                      s_currentMsg;
 
 #if wxUSE_MENUS_NATIVE
 QMSG                      s_currentMsg;
 
 #if wxUSE_MENUS_NATIVE

-wxMenu*                   wxCurrentPopupMenu = NULL;
+extern wxMenu*            wxCurrentPopupMenu;

 #endif // wxUSE_MENUS_NATIVE
 
 // ---------------------------------------------------------------------------
 #endif // wxUSE_MENUS_NATIVE
 
 // ---------------------------------------------------------------------------


@@ -1784,10 +1786,6 @@ bool wxWindowOS2::DoPopupMenu( wxMenu* pMenu, int nX, int nY )
     bool bIsWaiting = true;
     int nHeight;
 
     bool bIsWaiting = true;
     int nHeight;
 

-    // Protect against recursion
-    if (wxCurrentPopupMenu)
-        return false;
-

     pMenu->SetInvokingWindow(this);
     pMenu->UpdateUI();
 
     pMenu->SetInvokingWindow(this);
     pMenu->UpdateUI();
 


@@ -3204,7 +3202,7 @@ bool wxWindowOS2::OS2OnDrawItem( int vId,
                                  WXDRAWITEMSTRUCT* pItemStruct )
 {
 #if wxUSE_OWNER_DRAWN
                                  WXDRAWITEMSTRUCT* pItemStruct )
 {
 #if wxUSE_OWNER_DRAWN

-    wxDC                            vDc;
+    wxClientDC                      vDc(this);

 
 #if wxUSE_MENUS_NATIVE
     //
 
 #if wxUSE_MENUS_NATIVE
     //


@@ -3223,8 +3221,10 @@ bool wxWindowOS2::OS2OnDrawItem( int vId,
                                           ,pMeasureStruct->rclItem.xRight - pMeasureStruct->rclItem.xLeft
                                           ,pMeasureStruct->rclItem.yTop - pMeasureStruct->rclItem.yBottom
                                          );
                                           ,pMeasureStruct->rclItem.xRight - pMeasureStruct->rclItem.xLeft
                                           ,pMeasureStruct->rclItem.yTop - pMeasureStruct->rclItem.yBottom
                                          );

-        vDc.SetHDC( hDC, false );
-        vDc.SetHPS( pMeasureStruct->hps );
+
+       wxPMDCImpl *impl = (wxPMDCImpl*) vDc.GetImpl();
+        impl->SetHDC( hDC, false );
+        impl->SetHPS( pMeasureStruct->hps );

         //
         // Load the wxWidgets Pallete and set to RGB mode
         //
         //
         // Load the wxWidgets Pallete and set to RGB mode
         //


@@ -3485,7 +3485,7 @@ void wxWindow::OnPaint (
   wxPaintEvent&                     rEvent
 )
 {
   wxPaintEvent&                     rEvent
 )
 {

-    HDC                             hDC = (HDC)wxPaintDC::FindDCInCache((wxWindow*) rEvent.GetEventObject());
+    HDC                             hDC = (HDC)wxPaintDCImpl::FindDCInCache((wxWindow*) rEvent.GetEventObject());

 
     if (hDC != 0)
     {
 
     if (hDC != 0)
     {


@@ -3670,10 +3670,10 @@ bool wxWindowOS2::HandleEraseBkgnd( WXHDC hDC )
     if (vSwp.fl & SWP_MINIMIZE)
         return true;
 
     if (vSwp.fl & SWP_MINIMIZE)
         return true;
 

-    wxDC vDC;
-
-    vDC.m_hPS = (HPS)hDC; // this is really a PS
-    vDC.SetWindow((wxWindow*)this);
+    wxClientDC vDC(this);
+    wxPMDCImpl *impl = (wxPMDCImpl*) vDC.GetImpl();
+    impl->SetHDC(hDC);
+    impl->SetHPS((HPS)hDC); // this is really a PS

 
     wxEraseEvent vEvent(m_windowId, &vDC);
 
 
     wxEraseEvent vEvent(m_windowId, &vDC);
 


@@ -3681,14 +3681,15 @@ bool wxWindowOS2::HandleEraseBkgnd( WXHDC hDC )
 
     rc = HandleWindowEvent(vEvent);
 
 
     rc = HandleWindowEvent(vEvent);
 

-    vDC.m_hPS = NULLHANDLE;
+    impl->SetHPS(NULLHANDLE);

     return true;
 } // end of wxWindowOS2::HandleEraseBkgnd
 
 void wxWindowOS2::OnEraseBackground(wxEraseEvent& rEvent)
 {
     RECTL   vRect;
     return true;
 } // end of wxWindowOS2::HandleEraseBkgnd
 
 void wxWindowOS2::OnEraseBackground(wxEraseEvent& rEvent)
 {
     RECTL   vRect;

-    HPS     hPS = rEvent.GetDC()->GetHPS();
+    wxPMDCImpl *impl = (wxPMDCImpl*) rEvent.GetDC()->GetImpl();
+    HPS     hPS = impl->GetHPS();

     APIRET  rc;
     LONG    lColor = m_backgroundColour.GetPixel();
 
     APIRET  rc;
     LONG    lColor = m_backgroundColour.GetPixel();