ANSI mode compilation fix

[wxWidgets.git] / src / msw / dc.cpp

diff --git a/src/msw/dc.cpp b/src/msw/dc.cpp
index 56748f75185151b079b48008ecb9eb04b6f262c4..1db02a2c5733603c8ba8be74a52a0b44db1750ce 100644 (file)
--- a/src/msw/dc.cpp
+++ b/src/msw/dc.cpp
@@ -28,7 +28,6 @@
     #include "wx/msw/wrapcdlg.h"
     #include "wx/image.h"
     #include "wx/window.h"
     #include "wx/msw/wrapcdlg.h"
     #include "wx/image.h"
     #include "wx/window.h"

-    #include "wx/dc.h"

     #include "wx/utils.h"
     #include "wx/dialog.h"
     #include "wx/app.h"
     #include "wx/utils.h"
     #include "wx/dialog.h"
     #include "wx/app.h"


@@ -40,6 +39,7 @@
     #include "wx/module.h"
 #endif
 
     #include "wx/module.h"
 #endif
 

+#include "wx/msw/dc.h"

 #include "wx/sysopt.h"
 #include "wx/dynlib.h"
 
 #include "wx/sysopt.h"
 #include "wx/dynlib.h"
 


@@ -76,7 +76,7 @@
     #define WXMICROWIN_CHECK_HDC_RET(x)
 #endif
 
     #define WXMICROWIN_CHECK_HDC_RET(x)
 #endif
 

-IMPLEMENT_ABSTRACT_CLASS(wxDC, wxDCBase)
+IMPLEMENT_ABSTRACT_CLASS(wxMSWDCImpl, wxDCImpl)

 
 // ---------------------------------------------------------------------------
 // constants
 
 // ---------------------------------------------------------------------------
 // constants


@@ -84,9 +84,6 @@ IMPLEMENT_ABSTRACT_CLASS(wxDC, wxDCBase)
 
 static const int VIEWPORT_EXTENT = 1000;
 
 
 static const int VIEWPORT_EXTENT = 1000;
 

-static const int MM_POINTS = 9;
-static const int MM_METRIC = 10;
-

 // ROPs which don't have standard names (see "Ternary Raster Operations" in the
 // MSDN docs for how this and other numbers in wxDC::Blit() are obtained)
 #define DSTCOPY 0x00AA0029      // a.k.a. NOP operation
 // ROPs which don't have standard names (see "Ternary Raster Operations" in the
 // MSDN docs for how this and other numbers in wxDC::Blit() are obtained)
 #define DSTCOPY 0x00AA0029      // a.k.a. NOP operation


@@ -131,7 +128,7 @@ static inline double DegToRad(double deg) { return (deg * M_PI) / 180.0; }
 // otherwise
 static bool AlphaBlt(HDC hdcDst,
                      int x, int y, int dstWidth, int dstHeight,
 // otherwise
 static bool AlphaBlt(HDC hdcDst,
                      int x, int y, int dstWidth, int dstHeight,

-                     int srcX, int srcY, 
+                     int srcX, int srcY,

                      int srcWidth, int srcHeight,
                      HDC hdcSrc,
                      const wxBitmap& bmp);
                      int srcWidth, int srcHeight,
                      HDC hdcSrc,
                      const wxBitmap& bmp);


@@ -142,7 +139,7 @@ static bool AlphaBlt(HDC hdcDst,
 static void
 wxAlphaBlend(HDC hdcDst, int xDst, int yDst,
              int dstWidth, int dstHeight,
 static void
 wxAlphaBlend(HDC hdcDst, int xDst, int yDst,
              int dstWidth, int dstHeight,

-             int srcX, int srcY, 
+             int srcX, int srcY,

              int srcWidth, int srcHeight,
              const wxBitmap& bmpSrc);
 
              int srcWidth, int srcHeight,
              const wxBitmap& bmpSrc);
 


@@ -161,11 +158,11 @@ wxAlphaBlend(HDC hdcDst, int xDst, int yDst,
 class wxColourChanger
 {
 public:
 class wxColourChanger
 {
 public:

-    wxColourChanger(wxDC& dc);
+    wxColourChanger(wxMSWDCImpl& dc);

    ~wxColourChanger();
 
 private:
    ~wxColourChanger();
 
 private:

-    wxDC& m_dc;
+    wxMSWDCImpl& m_dc;

 
     COLORREF m_colFgOld, m_colBgOld;
 
 
     COLORREF m_colFgOld, m_colBgOld;
 


@@ -238,14 +235,37 @@ public:
         return m_dll.IsLoaded() ? m_dll.GetSymbol(name) : NULL;
     }
 
         return m_dll.IsLoaded() ? m_dll.GetSymbol(name) : NULL;
     }
 

+    void Unload()
+    {
+        if ( m_dll.IsLoaded() )
+        {
+            m_dll.Unload();
+        }
+    }
+

 private:
     wxDynamicLibrary m_dll;
     const wxChar *m_dllName;
 };
 
 private:
     wxDynamicLibrary m_dll;
     const wxChar *m_dllName;
 };
 

-static wxOnceOnlyDLLLoader wxGDI32DLL(_T("gdi32"));

 static wxOnceOnlyDLLLoader wxMSIMG32DLL(_T("msimg32"));
 
 static wxOnceOnlyDLLLoader wxMSIMG32DLL(_T("msimg32"));
 

+// we must ensure that DLLs are unloaded before the static objects cleanup time
+// because we may hit the notorious DllMain() dead lock in this case if wx is
+// used as a DLL (attempting to unload another DLL from inside DllMain() hangs
+// under Windows because it tries to reacquire the same lock)
+class wxGDIDLLsCleanupModule : public wxModule
+{
+public:
+    virtual bool OnInit() { return true; }
+    virtual void OnExit() { wxMSIMG32DLL.Unload(); }
+
+private:
+    DECLARE_DYNAMIC_CLASS(wxGDIDLLsCleanupModule)
+};
+
+IMPLEMENT_DYNAMIC_CLASS(wxGDIDLLsCleanupModule, wxModule)
+

 #endif // wxUSE_DYNLIB_CLASS
 
 // ===========================================================================
 #endif // wxUSE_DYNLIB_CLASS
 
 // ===========================================================================


@@ -256,10 +276,10 @@ static wxOnceOnlyDLLLoader wxMSIMG32DLL(_T("msimg32"));
 // wxColourChanger
 // ----------------------------------------------------------------------------
 
 // wxColourChanger
 // ----------------------------------------------------------------------------
 

-wxColourChanger::wxColourChanger(wxDC& dc) : m_dc(dc)
+wxColourChanger::wxColourChanger(wxMSWDCImpl& dc) : m_dc(dc)

 {
     const wxBrush& brush = dc.GetBrush();
 {
     const wxBrush& brush = dc.GetBrush();

-    if ( brush.Ok() && brush.GetStyle() == wxSTIPPLE_MASK_OPAQUE )
+    if ( brush.IsOk() && brush.GetStyle() == wxBRUSHSTYLE_STIPPLE_MASK_OPAQUE )

     {
         HDC hdc = GetHdcOf(dc);
         m_colFgOld = ::GetTextColor(hdc);
     {
         HDC hdc = GetHdcOf(dc);
         m_colFgOld = ::GetTextColor(hdc);


@@ -268,20 +288,20 @@ wxColourChanger::wxColourChanger(wxDC& dc) : m_dc(dc)
         // note that Windows convention is opposite to wxWidgets one, this is
         // why text colour becomes the background one and vice versa
         const wxColour& colFg = dc.GetTextForeground();
         // note that Windows convention is opposite to wxWidgets one, this is
         // why text colour becomes the background one and vice versa
         const wxColour& colFg = dc.GetTextForeground();

-        if ( colFg.Ok() )
+        if ( colFg.IsOk() )

         {
             ::SetBkColor(hdc, colFg.GetPixel());
         }
 
         const wxColour& colBg = dc.GetTextBackground();
         {
             ::SetBkColor(hdc, colFg.GetPixel());
         }
 
         const wxColour& colBg = dc.GetTextBackground();

-        if ( colBg.Ok() )
+        if ( colBg.IsOk() )

         {
             ::SetTextColor(hdc, colBg.GetPixel());
         }
 
         SetBkMode(hdc,
         {
             ::SetTextColor(hdc, colBg.GetPixel());
         }
 
         SetBkMode(hdc,

-                  dc.GetBackgroundMode() == wxTRANSPARENT ? TRANSPARENT
-                                                          : OPAQUE);
+                  dc.GetBackgroundMode() == wxBRUSHSTYLE_TRANSPARENT
+                                                  ? TRANSPARENT : OPAQUE);

 
         // flag which telsl us to undo changes in the dtor
         m_changed = true;
 
         // flag which telsl us to undo changes in the dtor
         m_changed = true;


@@ -307,10 +327,17 @@ wxColourChanger::~wxColourChanger()
 }
 
 // ---------------------------------------------------------------------------
 }
 
 // ---------------------------------------------------------------------------

-// wxDC
+// wxMSWDCImpl

 // ---------------------------------------------------------------------------
 
 // ---------------------------------------------------------------------------
 

-wxDC::~wxDC()
+wxMSWDCImpl::wxMSWDCImpl( wxDC *owner, WXHDC hDC ) :
+    wxDCImpl( owner )
+{
+    Init();
+    m_hDC = hDC;
+}
+
+wxMSWDCImpl::~wxMSWDCImpl()

 {
     if ( m_hDC != 0 )
     {
 {
     if ( m_hDC != 0 )
     {


@@ -324,9 +351,9 @@ wxDC::~wxDC()
         }
         else // we don't own our HDC
         {
         }
         else // we don't own our HDC
         {

-            if (m_canvas)
+            if (m_window)

             {
             {

-                ::ReleaseDC(GetHwndOf(m_canvas), GetHdc());
+                ::ReleaseDC(GetHwndOf(m_window), GetHdc());

             }
             else
             {
             }
             else
             {


@@ -340,7 +367,7 @@ wxDC::~wxDC()
 // This will select current objects out of the DC,
 // which is what you have to do before deleting the
 // DC.
 // This will select current objects out of the DC,
 // which is what you have to do before deleting the
 // DC.

-void wxDC::SelectOldObjects(WXHDC dc)
+void wxMSWDCImpl::SelectOldObjects(WXHDC dc)

 {
     if (dc)
     {
 {
     if (dc)
     {


@@ -348,7 +375,7 @@ void wxDC::SelectOldObjects(WXHDC dc)
         {
             ::SelectObject((HDC) dc, (HBITMAP) m_oldBitmap);
 #ifdef __WXDEBUG__
         {
             ::SelectObject((HDC) dc, (HBITMAP) m_oldBitmap);
 #ifdef __WXDEBUG__

-            if (m_selectedBitmap.Ok())
+            if (m_selectedBitmap.IsOk())

             {
                 m_selectedBitmap.SetSelectedInto(NULL);
             }
             {
                 m_selectedBitmap.SetSelectedInto(NULL);
             }


@@ -394,7 +421,7 @@ void wxDC::SelectOldObjects(WXHDC dc)
 // clipping
 // ---------------------------------------------------------------------------
 
 // clipping
 // ---------------------------------------------------------------------------
 

-void wxDC::UpdateClipBox()
+void wxMSWDCImpl::UpdateClipBox()

 {
     WXMICROWIN_CHECK_HDC
 
 {
     WXMICROWIN_CHECK_HDC
 


@@ -408,25 +435,25 @@ void wxDC::UpdateClipBox()
 }
 
 void
 }
 
 void

-wxDC::DoGetClippingBox(wxCoord *x, wxCoord *y, wxCoord *w, wxCoord *h) const
+wxMSWDCImpl::DoGetClippingBox(wxCoord *x, wxCoord *y, wxCoord *w, wxCoord *h) const

 {
     // check if we should try to retrieve the clipping region possibly not set
     // by our SetClippingRegion() but preset by Windows:this can only happen
     // when we're associated with an existing HDC usign SetHDC(), see there
     if ( m_clipping && !m_clipX1 && !m_clipX2 )
     {
 {
     // check if we should try to retrieve the clipping region possibly not set
     // by our SetClippingRegion() but preset by Windows:this can only happen
     // when we're associated with an existing HDC usign SetHDC(), see there
     if ( m_clipping && !m_clipX1 && !m_clipX2 )
     {

-        wxDC *self = wxConstCast(this, wxDC);
+        wxMSWDCImpl *self = wxConstCast(this, wxMSWDCImpl);

         self->UpdateClipBox();
 
         if ( !m_clipX1 && !m_clipX2 )
             self->m_clipping = false;
     }
 
         self->UpdateClipBox();
 
         if ( !m_clipX1 && !m_clipX2 )
             self->m_clipping = false;
     }
 

-    wxDCBase::DoGetClippingBox(x, y, w, h);
+    wxDCImpl::DoGetClippingBox(x, y, w, h);

 }
 
 // common part of DoSetClippingRegion() and DoSetClippingRegionAsRegion()
 }
 
 // common part of DoSetClippingRegion() and DoSetClippingRegionAsRegion()

-void wxDC::SetClippingHrgn(WXHRGN hrgn)
+void wxMSWDCImpl::SetClippingHrgn(WXHRGN hrgn)

 {
     wxCHECK_RET( hrgn, wxT("invalid clipping region") );
 
 {
     wxCHECK_RET( hrgn, wxT("invalid clipping region") );
 


@@ -471,7 +498,7 @@ void wxDC::SetClippingHrgn(WXHRGN hrgn)
     UpdateClipBox();
 }
 
     UpdateClipBox();
 }
 

-void wxDC::DoSetClippingRegion(wxCoord x, wxCoord y, wxCoord w, wxCoord h)
+void wxMSWDCImpl::DoSetClippingRegion(wxCoord x, wxCoord y, wxCoord w, wxCoord h)

 {
     // the region coords are always the device ones, so do the translation
     // manually
 {
     // the region coords are always the device ones, so do the translation
     // manually


@@ -493,12 +520,12 @@ void wxDC::DoSetClippingRegion(wxCoord x, wxCoord y, wxCoord w, wxCoord h)
     }
 }
 
     }
 }
 

-void wxDC::DoSetClippingRegionAsRegion(const wxRegion& region)
+void wxMSWDCImpl::DoSetClippingRegionAsRegion(const wxRegion& region)

 {
     SetClippingHrgn(region.GetHRGN());
 }
 
 {
     SetClippingHrgn(region.GetHRGN());
 }
 

-void wxDC::DestroyClippingRegion()
+void wxMSWDCImpl::DestroyClippingRegion()

 {
     WXMICROWIN_CHECK_HDC
 
 {
     WXMICROWIN_CHECK_HDC
 


@@ -522,19 +549,19 @@ void wxDC::DestroyClippingRegion()
 #endif
     }
 
 #endif
     }
 

-    wxDCBase::DestroyClippingRegion();
+    wxDCImpl::DestroyClippingRegion();

 }
 
 // ---------------------------------------------------------------------------
 // query capabilities
 // ---------------------------------------------------------------------------
 
 }
 
 // ---------------------------------------------------------------------------
 // query capabilities
 // ---------------------------------------------------------------------------
 

-bool wxDC::CanDrawBitmap() const
+bool wxMSWDCImpl::CanDrawBitmap() const

 {
     return true;
 }
 
 {
     return true;
 }
 

-bool wxDC::CanGetTextExtent() const
+bool wxMSWDCImpl::CanGetTextExtent() const

 {
 #ifdef __WXMICROWIN__
     // TODO Extend MicroWindows' GetDeviceCaps function
 {
 #ifdef __WXMICROWIN__
     // TODO Extend MicroWindows' GetDeviceCaps function


@@ -547,7 +574,7 @@ bool wxDC::CanGetTextExtent() const
 #endif
 }
 
 #endif
 }
 

-int wxDC::GetDepth() const
+int wxMSWDCImpl::GetDepth() const

 {
     WXMICROWIN_CHECK_HDC_RET(16)
 
 {
     WXMICROWIN_CHECK_HDC_RET(16)
 


@@ -558,21 +585,21 @@ int wxDC::GetDepth() const
 // drawing
 // ---------------------------------------------------------------------------
 
 // drawing
 // ---------------------------------------------------------------------------
 

-void wxDC::Clear()
+void wxMSWDCImpl::Clear()

 {
     WXMICROWIN_CHECK_HDC
 
     RECT rect;
 {
     WXMICROWIN_CHECK_HDC
 
     RECT rect;

-    if ( m_canvas )
+    if (m_window)

     {
     {

-        GetClientRect((HWND) m_canvas->GetHWND(), &rect);
+        GetClientRect((HWND) m_window->GetHWND(), &rect);

     }
     else
     {
         // No, I think we should simply ignore this if printing on e.g.
         // a printer DC.
     }
     else
     {
         // No, I think we should simply ignore this if printing on e.g.
         // a printer DC.

-        // wxCHECK_RET( m_selectedBitmap.Ok(), wxT("this DC can't be cleared") );
-        if (!m_selectedBitmap.Ok())
+        // wxCHECK_RET( m_selectedBitmap.IsOk(), wxT("this DC can't be cleared") );
+        if (!m_selectedBitmap.IsOk())

             return;
 
         rect.left = -m_deviceOriginX; rect.top = -m_deviceOriginY;
             return;
 
         rect.left = -m_deviceOriginX; rect.top = -m_deviceOriginY;


@@ -592,7 +619,7 @@ void wxDC::Clear()
     RealizeScaleAndOrigin();
 }
 
     RealizeScaleAndOrigin();
 }
 

-bool wxDC::DoFloodFill(wxCoord WXUNUSED_IN_WINCE(x),
+bool wxMSWDCImpl::DoFloodFill(wxCoord WXUNUSED_IN_WINCE(x),

                        wxCoord WXUNUSED_IN_WINCE(y),
                        const wxColour& WXUNUSED_IN_WINCE(col),
                        int WXUNUSED_IN_WINCE(style))
                        wxCoord WXUNUSED_IN_WINCE(y),
                        const wxColour& WXUNUSED_IN_WINCE(col),
                        int WXUNUSED_IN_WINCE(style))


@@ -629,11 +656,11 @@ bool wxDC::DoFloodFill(wxCoord WXUNUSED_IN_WINCE(x),
 #endif
 }
 
 #endif
 }
 

-bool wxDC::DoGetPixel(wxCoord x, wxCoord y, wxColour *col) const
+bool wxMSWDCImpl::DoGetPixel(wxCoord x, wxCoord y, wxColour *col) const

 {
     WXMICROWIN_CHECK_HDC_RET(false)
 
 {
     WXMICROWIN_CHECK_HDC_RET(false)
 

-    wxCHECK_MSG( col, false, _T("NULL colour parameter in wxDC::GetPixel") );
+    wxCHECK_MSG( col, false, _T("NULL colour parameter in wxMSWDCImpl::GetPixel") );

 
     // get the color of the pixel
     COLORREF pixelcolor = ::GetPixel(GetHdc(), XLOG2DEV(x), YLOG2DEV(y));
 
     // get the color of the pixel
     COLORREF pixelcolor = ::GetPixel(GetHdc(), XLOG2DEV(x), YLOG2DEV(y));


@@ -643,7 +670,7 @@ bool wxDC::DoGetPixel(wxCoord x, wxCoord y, wxColour *col) const
     return true;
 }
 
     return true;
 }
 

-void wxDC::DoCrossHair(wxCoord x, wxCoord y)
+void wxMSWDCImpl::DoCrossHair(wxCoord x, wxCoord y)

 {
     WXMICROWIN_CHECK_HDC
 
 {
     WXMICROWIN_CHECK_HDC
 


@@ -659,7 +686,7 @@ void wxDC::DoCrossHair(wxCoord x, wxCoord y)
     CalcBoundingBox(x2, y2);
 }
 
     CalcBoundingBox(x2, y2);
 }
 

-void wxDC::DoDrawLine(wxCoord x1, wxCoord y1, wxCoord x2, wxCoord y2)
+void wxMSWDCImpl::DoDrawLine(wxCoord x1, wxCoord y1, wxCoord x2, wxCoord y2)

 {
     WXMICROWIN_CHECK_HDC
 
 {
     WXMICROWIN_CHECK_HDC
 


@@ -671,7 +698,7 @@ void wxDC::DoDrawLine(wxCoord x1, wxCoord y1, wxCoord x2, wxCoord y2)
 
 // Draws an arc of a circle, centred on (xc, yc), with starting point (x1, y1)
 // and ending at (x2, y2)
 
 // Draws an arc of a circle, centred on (xc, yc), with starting point (x1, y1)
 // and ending at (x2, y2)

-void wxDC::DoDrawArc(wxCoord x1, wxCoord y1,
+void wxMSWDCImpl::DoDrawArc(wxCoord x1, wxCoord y1,

                      wxCoord x2, wxCoord y2,
                      wxCoord xc, wxCoord yc)
 {
                      wxCoord x2, wxCoord y2,
                      wxCoord xc, wxCoord yc)
 {


@@ -696,7 +723,7 @@ void wxDC::DoDrawArc(wxCoord x1, wxCoord y1,
     // treat the special case of full circle separately
     if ( x1 == x2 && y1 == y2 )
     {
     // treat the special case of full circle separately
     if ( x1 == x2 && y1 == y2 )
     {

-        DrawEllipse(xc - r, yc - r, 2*r, 2*r);
+        GetOwner()->DrawEllipse(xc - r, yc - r, 2*r, 2*r);

         return;
     }
 
         return;
     }
 


@@ -713,7 +740,7 @@ void wxDC::DoDrawArc(wxCoord x1, wxCoord y1,
     wxCoord xxx2 = (wxCoord) (xxc+ray);
     wxCoord yyy2 = (wxCoord) (yyc+ray);
 
     wxCoord xxx2 = (wxCoord) (xxc+ray);
     wxCoord yyy2 = (wxCoord) (yyc+ray);
 

-    if ( m_brush.Ok() && m_brush.GetStyle() != wxTRANSPARENT )
+    if ( m_brush.IsOk() && m_brush.GetStyle() != wxBRUSHSTYLE_TRANSPARENT )

     {
         // Have to add 1 to bottom-right corner of rectangle
         // to make semi-circles look right (crooked line otherwise).
     {
         // Have to add 1 to bottom-right corner of rectangle
         // to make semi-circles look right (crooked line otherwise).


@@ -732,7 +759,7 @@ void wxDC::DoDrawArc(wxCoord x1, wxCoord y1,
 #endif
 }
 
 #endif
 }
 

-void wxDC::DoDrawCheckMark(wxCoord x1, wxCoord y1,
+void wxMSWDCImpl::DoDrawCheckMark(wxCoord x1, wxCoord y1,

                            wxCoord width, wxCoord height)
 {
     // cases when we don't have DrawFrameControl()
                            wxCoord width, wxCoord height)
 {
     // cases when we don't have DrawFrameControl()


@@ -749,7 +776,7 @@ void wxDC::DoDrawCheckMark(wxCoord x1, wxCoord y1,
     rect.bottom = y2;
 
 #ifdef __WXWINCE__
     rect.bottom = y2;
 
 #ifdef __WXWINCE__

-    DrawFrameControl(GetHdc(), &rect, DFC_BUTTON, DFCS_BUTTONCHECK);
+    DrawFrameControl(GetHdc(), &rect, DFC_BUTTON, DFCS_BUTTONCHECK | DFCS_CHECKED);

 #else
     DrawFrameControl(GetHdc(), &rect, DFC_MENU, DFCS_MENUCHECK);
 #endif
 #else
     DrawFrameControl(GetHdc(), &rect, DFC_MENU, DFCS_MENUCHECK);
 #endif


@@ -759,12 +786,12 @@ void wxDC::DoDrawCheckMark(wxCoord x1, wxCoord y1,
 #endif // Microwin/Normal
 }
 
 #endif // Microwin/Normal
 }
 

-void wxDC::DoDrawPoint(wxCoord x, wxCoord y)
+void wxMSWDCImpl::DoDrawPoint(wxCoord x, wxCoord y)

 {
     WXMICROWIN_CHECK_HDC
 
     COLORREF color = 0x00ffffff;
 {
     WXMICROWIN_CHECK_HDC
 
     COLORREF color = 0x00ffffff;

-    if (m_pen.Ok())
+    if (m_pen.IsOk())

     {
         color = m_pen.GetColour().GetPixel();
     }
     {
         color = m_pen.GetColour().GetPixel();
     }


@@ -774,7 +801,7 @@ void wxDC::DoDrawPoint(wxCoord x, wxCoord y)
     CalcBoundingBox(x, y);
 }
 
     CalcBoundingBox(x, y);
 }
 

-void wxDC::DoDrawPolygon(int n,
+void wxMSWDCImpl::DoDrawPolygon(int n,

                          wxPoint points[],
                          wxCoord xoffset,
                          wxCoord yoffset,
                          wxPoint points[],
                          wxCoord xoffset,
                          wxCoord yoffset,


@@ -822,7 +849,7 @@ void wxDC::DoDrawPolygon(int n,
 }
 
 void
 }
 
 void

-wxDC::DoDrawPolyPolygon(int n,
+wxMSWDCImpl::DoDrawPolyPolygon(int n,

                         int count[],
                         wxPoint points[],
                         wxCoord xoffset,
                         int count[],
                         wxPoint points[],
                         wxCoord xoffset,


@@ -830,7 +857,7 @@ wxDC::DoDrawPolyPolygon(int n,
                         int fillStyle)
 {
 #ifdef __WXWINCE__
                         int fillStyle)
 {
 #ifdef __WXWINCE__

-    wxDCBase::DoDrawPolyPolygon(n, count, points, xoffset, yoffset, fillStyle);
+    wxDCImpl::DoDrawPolyPolygon(n, count, points, xoffset, yoffset, fillStyle);

 #else
     WXMICROWIN_CHECK_HDC
 
 #else
     WXMICROWIN_CHECK_HDC
 


@@ -876,7 +903,7 @@ wxDC::DoDrawPolyPolygon(int n,
   // __WXWINCE__
 }
 
   // __WXWINCE__
 }
 

-void wxDC::DoDrawLines(int n, wxPoint points[], wxCoord xoffset, wxCoord yoffset)
+void wxMSWDCImpl::DoDrawLines(int n, wxPoint points[], wxCoord xoffset, wxCoord yoffset)

 {
     WXMICROWIN_CHECK_HDC
 
 {
     WXMICROWIN_CHECK_HDC
 


@@ -905,7 +932,7 @@ void wxDC::DoDrawLines(int n, wxPoint points[], wxCoord xoffset, wxCoord yoffset
     }
 }
 
     }
 }
 

-void wxDC::DoDrawRectangle(wxCoord x, wxCoord y, wxCoord width, wxCoord height)
+void wxMSWDCImpl::DoDrawRectangle(wxCoord x, wxCoord y, wxCoord width, wxCoord height)

 {
     WXMICROWIN_CHECK_HDC
 
 {
     WXMICROWIN_CHECK_HDC
 


@@ -914,40 +941,27 @@ void wxDC::DoDrawRectangle(wxCoord x, wxCoord y, wxCoord width, wxCoord height)
     wxCoord x2 = x + width;
     wxCoord y2 = y + height;
 
     wxCoord x2 = x + width;
     wxCoord y2 = y + height;
 

-    if ((m_logicalFunction == wxCOPY) && (m_pen.GetStyle() == wxTRANSPARENT))
-    {
-        RECT rect;
-        rect.left = XLOG2DEV(x);
-        rect.top = YLOG2DEV(y);
-        rect.right = XLOG2DEV(x2);
-        rect.bottom = YLOG2DEV(y2);
-        (void)FillRect(GetHdc(), &rect, (HBRUSH)m_brush.GetResourceHandle() );
-    }
-    else
-    {
-        // Windows draws the filled rectangles without outline (i.e. drawn with a
-        // transparent pen) one pixel smaller in both directions and we want them
-        // to have the same size regardless of which pen is used - adjust
+    wxCoord x2dev = XLOG2DEV(x2),
+            y2dev = YLOG2DEV(y2);

 
 

-        // I wonder if this shouldnt be done after the LOG2DEV() conversions. RR.
-        if ( m_pen.GetStyle() == wxTRANSPARENT )
-        {
-            // Apparently not needed for WinCE (see e.g. Life! demo)
+    // Windows (but not Windows CE) draws the filled rectangles without outline
+    // (i.e. drawn with a transparent pen) one pixel smaller in both directions
+    // and we want them to have the same size regardless of which pen is used

 #ifndef __WXWINCE__
 #ifndef __WXWINCE__

-            x2++;
-            y2++;
-#endif
-        }
-
-        (void)Rectangle(GetHdc(), XLOG2DEV(x), YLOG2DEV(y), XLOG2DEV(x2), YLOG2DEV(y2));
+    if ( m_pen.GetStyle() == wxPENSTYLE_TRANSPARENT )
+    {
+        x2dev++;
+        y2dev++;

     }
     }

+#endif // !__WXWINCE__

 
 

+    (void)Rectangle(GetHdc(), XLOG2DEV(x), YLOG2DEV(y), x2dev, y2dev);

 
     CalcBoundingBox(x, y);
     CalcBoundingBox(x2, y2);
 }
 
 
     CalcBoundingBox(x, y);
     CalcBoundingBox(x2, y2);
 }
 

-void wxDC::DoDrawRoundedRectangle(wxCoord x, wxCoord y, wxCoord width, wxCoord height, double radius)
+void wxMSWDCImpl::DoDrawRoundedRectangle(wxCoord x, wxCoord y, wxCoord width, wxCoord height, double radius)

 {
     WXMICROWIN_CHECK_HDC
 
 {
     WXMICROWIN_CHECK_HDC
 


@@ -968,7 +982,7 @@ void wxDC::DoDrawRoundedRectangle(wxCoord x, wxCoord y, wxCoord width, wxCoord h
     // Windows draws the filled rectangles without outline (i.e. drawn with a
     // transparent pen) one pixel smaller in both directions and we want them
     // to have the same size regardless of which pen is used - adjust
     // Windows draws the filled rectangles without outline (i.e. drawn with a
     // transparent pen) one pixel smaller in both directions and we want them
     // to have the same size regardless of which pen is used - adjust

-    if ( m_pen.GetStyle() == wxTRANSPARENT )
+    if ( m_pen.GetStyle() == wxPENSTYLE_TRANSPARENT )

     {
         x2++;
         y2++;
     {
         x2++;
         y2++;


@@ -981,7 +995,7 @@ void wxDC::DoDrawRoundedRectangle(wxCoord x, wxCoord y, wxCoord width, wxCoord h
     CalcBoundingBox(x2, y2);
 }
 
     CalcBoundingBox(x2, y2);
 }
 

-void wxDC::DoDrawEllipse(wxCoord x, wxCoord y, wxCoord width, wxCoord height)
+void wxMSWDCImpl::DoDrawEllipse(wxCoord x, wxCoord y, wxCoord width, wxCoord height)

 {
     WXMICROWIN_CHECK_HDC
 
 {
     WXMICROWIN_CHECK_HDC
 


@@ -997,11 +1011,11 @@ void wxDC::DoDrawEllipse(wxCoord x, wxCoord y, wxCoord width, wxCoord height)
 }
 
 #if wxUSE_SPLINES
 }
 
 #if wxUSE_SPLINES

-void wxDC::DoDrawSpline(const wxPointList *points)
+void wxMSWDCImpl::DoDrawSpline(const wxPointList *points)

 {
 #ifdef  __WXWINCE__
     // WinCE does not support ::PolyBezier so use generic version
 {
 #ifdef  __WXWINCE__
     // WinCE does not support ::PolyBezier so use generic version

-    wxDCBase::DoDrawSpline(points);
+    wxDCImpl::DoDrawSpline(points);

 #else
     // quadratic b-spline to cubic bezier spline conversion
     //
 #else
     // quadratic b-spline to cubic bezier spline conversion
     //


@@ -1096,7 +1110,7 @@ void wxDC::DoDrawSpline(const wxPointList *points)
 #endif
 
 // Chris Breeze 20/5/98: first implementation of DrawEllipticArc on Windows
 #endif
 
 // Chris Breeze 20/5/98: first implementation of DrawEllipticArc on Windows

-void wxDC::DoDrawEllipticArc(wxCoord x,wxCoord y,wxCoord w,wxCoord h,double sa,double ea)
+void wxMSWDCImpl::DoDrawEllipticArc(wxCoord x,wxCoord y,wxCoord w,wxCoord h,double sa,double ea)

 {
 #ifdef __WXWINCE__
     DoDrawEllipticArcRot( x, y, w, h, sa, ea );
 {
 #ifdef __WXWINCE__
     DoDrawEllipticArcRot( x, y, w, h, sa, ea );


@@ -1122,6 +1136,17 @@ void wxDC::DoDrawEllipticArc(wxCoord x,wxCoord y,wxCoord w,wxCoord h,double sa,d
     rx2 += (int)(100.0 * abs(w) * cos(ea));
     ry2 -= (int)(100.0 * abs(h) * m_signY * sin(ea));
 
     rx2 += (int)(100.0 * abs(w) * cos(ea));
     ry2 -= (int)(100.0 * abs(h) * m_signY * sin(ea));
 

+    // Swap start and end positions if the end angle is less than the start angle.
+    if (ea < sa) {
+        int temp;
+        temp = rx2;
+        rx2 = rx1;
+        rx1 = temp;
+        temp = ry2;
+        ry2 = ry1;
+        ry1 = temp;
+    }
+

     // draw pie with NULL_PEN first and then outline otherwise a line is
     // drawn from the start and end points to the centre
     HPEN hpenOld = (HPEN) ::SelectObject(GetHdc(), (HPEN) ::GetStockObject(NULL_PEN));
     // draw pie with NULL_PEN first and then outline otherwise a line is
     // drawn from the start and end points to the centre
     HPEN hpenOld = (HPEN) ::SelectObject(GetHdc(), (HPEN) ::GetStockObject(NULL_PEN));


@@ -1146,11 +1171,11 @@ void wxDC::DoDrawEllipticArc(wxCoord x,wxCoord y,wxCoord w,wxCoord h,double sa,d
 #endif
 }
 
 #endif
 }
 

-void wxDC::DoDrawIcon(const wxIcon& icon, wxCoord x, wxCoord y)
+void wxMSWDCImpl::DoDrawIcon(const wxIcon& icon, wxCoord x, wxCoord y)

 {
     WXMICROWIN_CHECK_HDC
 
 {
     WXMICROWIN_CHECK_HDC
 

-    wxCHECK_RET( icon.Ok(), wxT("invalid icon in DrawIcon") );
+    wxCHECK_RET( icon.IsOk(), wxT("invalid icon in DrawIcon") );

 
 #ifdef __WIN32__
     ::DrawIconEx(GetHdc(), XLOG2DEV(x), YLOG2DEV(y), GetHiconOf(icon), icon.GetWidth(), icon.GetHeight(), 0, NULL, DI_NORMAL);
 
 #ifdef __WIN32__
     ::DrawIconEx(GetHdc(), XLOG2DEV(x), YLOG2DEV(y), GetHiconOf(icon), icon.GetWidth(), icon.GetHeight(), 0, NULL, DI_NORMAL);


@@ -1162,11 +1187,11 @@ void wxDC::DoDrawIcon(const wxIcon& icon, wxCoord x, wxCoord y)
     CalcBoundingBox(x + icon.GetWidth(), y + icon.GetHeight());
 }
 
     CalcBoundingBox(x + icon.GetWidth(), y + icon.GetHeight());
 }
 

-void wxDC::DoDrawBitmap( const wxBitmap &bmp, wxCoord x, wxCoord y, bool useMask )
+void wxMSWDCImpl::DoDrawBitmap( const wxBitmap &bmp, wxCoord x, wxCoord y, bool useMask )

 {
     WXMICROWIN_CHECK_HDC
 
 {
     WXMICROWIN_CHECK_HDC
 

-    wxCHECK_RET( bmp.Ok(), _T("invalid bitmap in wxDC::DrawBitmap") );
+    wxCHECK_RET( bmp.IsOk(), _T("invalid bitmap in wxMSWDCImpl::DrawBitmap") );

 
     int width = bmp.GetWidth(),
         height = bmp.GetHeight();
 
     int width = bmp.GetWidth(),
         height = bmp.GetHeight();


@@ -1241,13 +1266,13 @@ void wxDC::DoDrawBitmap( const wxBitmap &bmp, wxCoord x, wxCoord y, bool useMask
         if ( !ok )
 #endif // Win32
         {
         if ( !ok )
 #endif // Win32
         {

-            // Rather than reproduce wxDC::Blit, let's do it at the wxWin API
+            // Rather than reproduce wxMSWDCImpl::Blit, let's do it at the wxWin API

             // level
             wxMemoryDC memDC;
 
             memDC.SelectObjectAsSource(bmp);
 
             // level
             wxMemoryDC memDC;
 
             memDC.SelectObjectAsSource(bmp);
 

-            Blit(x, y, width, height, &memDC, 0, 0, wxCOPY, useMask);
+            GetOwner()->Blit(x, y, width, height, &memDC, 0, 0, wxCOPY, useMask);

 
             memDC.SelectObject(wxNullBitmap);
         }
 
             memDC.SelectObject(wxNullBitmap);
         }


@@ -1262,11 +1287,11 @@ void wxDC::DoDrawBitmap( const wxBitmap &bmp, wxCoord x, wxCoord y, bool useMask
 
         COLORREF old_textground = ::GetTextColor(GetHdc());
         COLORREF old_background = ::GetBkColor(GetHdc());
 
         COLORREF old_textground = ::GetTextColor(GetHdc());
         COLORREF old_background = ::GetBkColor(GetHdc());

-        if (m_textForegroundColour.Ok())
+        if (m_textForegroundColour.IsOk())

         {
             ::SetTextColor(GetHdc(), m_textForegroundColour.GetPixel() );
         }
         {
             ::SetTextColor(GetHdc(), m_textForegroundColour.GetPixel() );
         }

-        if (m_textBackgroundColour.Ok())
+        if (m_textBackgroundColour.IsOk())

         {
             ::SetBkColor(GetHdc(), m_textBackgroundColour.GetPixel() );
         }
         {
             ::SetBkColor(GetHdc(), m_textBackgroundColour.GetPixel() );
         }


@@ -1296,7 +1321,7 @@ void wxDC::DoDrawBitmap( const wxBitmap &bmp, wxCoord x, wxCoord y, bool useMask
     }
 }
 
     }
 }
 

-void wxDC::DoDrawText(const wxString& text, wxCoord x, wxCoord y)
+void wxMSWDCImpl::DoDrawText(const wxString& text, wxCoord x, wxCoord y)

 {
     WXMICROWIN_CHECK_HDC
 
 {
     WXMICROWIN_CHECK_HDC
 


@@ -1306,25 +1331,25 @@ void wxDC::DoDrawText(const wxString& text, wxCoord x, wxCoord y)
     CalcBoundingBox(x, y);
 
     wxCoord w, h;
     CalcBoundingBox(x, y);
 
     wxCoord w, h;

-    GetTextExtent(text, &w, &h);
+    GetOwner()->GetTextExtent(text, &w, &h);

     CalcBoundingBox(x + w, y + h);
 }
 
     CalcBoundingBox(x + w, y + h);
 }
 

-void wxDC::DrawAnyText(const wxString& text, wxCoord x, wxCoord y)
+void wxMSWDCImpl::DrawAnyText(const wxString& text, wxCoord x, wxCoord y)

 {
     WXMICROWIN_CHECK_HDC
 
     // prepare for drawing the text
 {
     WXMICROWIN_CHECK_HDC
 
     // prepare for drawing the text

-    if ( m_textForegroundColour.Ok() )
+    if ( m_textForegroundColour.IsOk() )

         SetTextColor(GetHdc(), m_textForegroundColour.GetPixel());
 
     DWORD old_background = 0;
         SetTextColor(GetHdc(), m_textForegroundColour.GetPixel());
 
     DWORD old_background = 0;

-    if ( m_textBackgroundColour.Ok() )
+    if ( m_textBackgroundColour.IsOk() )

     {
         old_background = SetBkColor(GetHdc(), m_textBackgroundColour.GetPixel() );
     }
 
     {
         old_background = SetBkColor(GetHdc(), m_textBackgroundColour.GetPixel() );
     }
 

-    SetBkMode(GetHdc(), m_backgroundMode == wxTRANSPARENT ? TRANSPARENT
+    SetBkMode(GetHdc(), m_backgroundMode == wxBRUSHSTYLE_TRANSPARENT ? TRANSPARENT

                                                           : OPAQUE);
 
 #ifdef __WXWINCE__
                                                           : OPAQUE);
 
 #ifdef __WXWINCE__


@@ -1344,13 +1369,13 @@ void wxDC::DrawAnyText(const wxString& text, wxCoord x, wxCoord y)
     // restore the old parameters (text foreground colour may be left because
     // it never is set to anything else, but background should remain
     // transparent even if we just drew an opaque string)
     // restore the old parameters (text foreground colour may be left because
     // it never is set to anything else, but background should remain
     // transparent even if we just drew an opaque string)

-    if ( m_textBackgroundColour.Ok() )
+    if ( m_textBackgroundColour.IsOk() )

         (void)SetBkColor(GetHdc(), old_background);
 
     SetBkMode(GetHdc(), TRANSPARENT);
 }
 
         (void)SetBkColor(GetHdc(), old_background);
 
     SetBkMode(GetHdc(), TRANSPARENT);
 }
 

-void wxDC::DoDrawRotatedText(const wxString& text,
+void wxMSWDCImpl::DoDrawRotatedText(const wxString& text,

                              wxCoord x, wxCoord y,
                              double angle)
 {
                              wxCoord x, wxCoord y,
                              double angle)
 {


@@ -1360,7 +1385,7 @@ void wxDC::DoDrawRotatedText(const wxString& text,
     // "else" part below to avoid that DrawRotatedText(angle = 180) and
     // DrawRotatedText(angle = 0) use different fonts (we can't use the default
     // font for drawing rotated fonts unfortunately)
     // "else" part below to avoid that DrawRotatedText(angle = 180) and
     // DrawRotatedText(angle = 0) use different fonts (we can't use the default
     // font for drawing rotated fonts unfortunately)

-    if ( (angle == 0.0) && m_font.Ok() )
+    if ( (angle == 0.0) && m_font.IsOk() )

     {
         DoDrawText(text, x, y);
     }
     {
         DoDrawText(text, x, y);
     }


@@ -1370,7 +1395,7 @@ void wxDC::DoDrawRotatedText(const wxString& text,
         // NB: don't take DEFAULT_GUI_FONT (a.k.a. wxSYS_DEFAULT_GUI_FONT)
         //     because it's not TrueType and so can't have non zero
         //     orientation/escapement under Win9x
         // NB: don't take DEFAULT_GUI_FONT (a.k.a. wxSYS_DEFAULT_GUI_FONT)
         //     because it's not TrueType and so can't have non zero
         //     orientation/escapement under Win9x

-        wxFont font = m_font.Ok() ? m_font : *wxSWISS_FONT;
+        wxFont font = m_font.IsOk() ? m_font : *wxSWISS_FONT;

         HFONT hfont = (HFONT)font.GetResourceHandle();
         LOGFONT lf;
         if ( ::GetObject(hfont, sizeof(lf), &lf) == 0 )
         HFONT hfont = (HFONT)font.GetResourceHandle();
         LOGFONT lf;
         if ( ::GetObject(hfont, sizeof(lf), &lf) == 0 )


@@ -1402,7 +1427,7 @@ void wxDC::DoDrawRotatedText(const wxString& text,
         // containing the text to it (simpler and probably not slower than
         // determining which of them is really topmost/leftmost/...)
         wxCoord w, h;
         // containing the text to it (simpler and probably not slower than
         // determining which of them is really topmost/leftmost/...)
         wxCoord w, h;

-        GetTextExtent(text, &w, &h);
+        GetOwner()->GetTextExtent(text, &w, &h);

 
         double rad = DegToRad(angle);
 
 
         double rad = DegToRad(angle);
 


@@ -1425,7 +1450,7 @@ void wxDC::DoDrawRotatedText(const wxString& text,
 
 #if wxUSE_PALETTE
 
 
 #if wxUSE_PALETTE
 

-void wxDC::DoSelectPalette(bool realize)
+void wxMSWDCImpl::DoSelectPalette(bool realize)

 {
     WXMICROWIN_CHECK_HDC
 
 {
     WXMICROWIN_CHECK_HDC
 


@@ -1437,7 +1462,7 @@ void wxDC::DoSelectPalette(bool realize)
         m_oldPalette = 0;
     }
 
         m_oldPalette = 0;
     }
 

-    if ( m_palette.Ok() )
+    if ( m_palette.IsOk() )

     {
         HPALETTE oldPal = ::SelectPalette(GetHdc(),
                                           GetHpaletteOf(m_palette),
     {
         HPALETTE oldPal = ::SelectPalette(GetHdc(),
                                           GetHpaletteOf(m_palette),


@@ -1450,22 +1475,22 @@ void wxDC::DoSelectPalette(bool realize)
     }
 }
 
     }
 }
 

-void wxDC::SetPalette(const wxPalette& palette)
+void wxMSWDCImpl::SetPalette(const wxPalette& palette)

 {
 {

-    if ( palette.Ok() )
+    if ( palette.IsOk() )

     {
         m_palette = palette;
         DoSelectPalette(true);
     }
 }
 
     {
         m_palette = palette;
         DoSelectPalette(true);
     }
 }
 

-void wxDC::InitializePalette()
+void wxMSWDCImpl::InitializePalette()

 {
     if ( wxDisplayDepth() <= 8 )
     {
         // look for any window or parent that has a custom palette. If any has
         // one then we need to use it in drawing operations
 {
     if ( wxDisplayDepth() <= 8 )
     {
         // look for any window or parent that has a custom palette. If any has
         // one then we need to use it in drawing operations

-        wxWindow *win = m_canvas->GetAncestorWithCustomPalette();
+        wxWindow *win = m_window->GetAncestorWithCustomPalette();

 
         m_hasCustomPalette = win && win->HasCustomPalette();
         if ( m_hasCustomPalette )
 
         m_hasCustomPalette = win && win->HasCustomPalette();
         if ( m_hasCustomPalette )


@@ -1483,14 +1508,14 @@ void wxDC::InitializePalette()
 // SetFont/Pen/Brush() really ask to be implemented as a single template
 // function... but doing it is not worth breaking OpenWatcom build <sigh>
 
 // SetFont/Pen/Brush() really ask to be implemented as a single template
 // function... but doing it is not worth breaking OpenWatcom build <sigh>
 

-void wxDC::SetFont(const wxFont& font)
+void wxMSWDCImpl::SetFont(const wxFont& font)

 {
     WXMICROWIN_CHECK_HDC
 
     if ( font == m_font )
         return;
 
 {
     WXMICROWIN_CHECK_HDC
 
     if ( font == m_font )
         return;
 

-    if ( font.Ok() )
+    if ( font.IsOk() )

     {
         HGDIOBJ hfont = ::SelectObject(GetHdc(), GetHfontOf(font));
         if ( hfont == HGDI_ERROR )
     {
         HGDIOBJ hfont = ::SelectObject(GetHdc(), GetHfontOf(font));
         if ( hfont == HGDI_ERROR )


@@ -1521,14 +1546,14 @@ void wxDC::SetFont(const wxFont& font)
     }
 }
 
     }
 }
 

-void wxDC::SetPen(const wxPen& pen)
+void wxMSWDCImpl::SetPen(const wxPen& pen)

 {
     WXMICROWIN_CHECK_HDC
 
     if ( pen == m_pen )
         return;
 
 {
     WXMICROWIN_CHECK_HDC
 
     if ( pen == m_pen )
         return;
 

-    if ( pen.Ok() )
+    if ( pen.IsOk() )

     {
         HGDIOBJ hpen = ::SelectObject(GetHdc(), GetHpenOf(pen));
         if ( hpen == HGDI_ERROR )
     {
         HGDIOBJ hpen = ::SelectObject(GetHdc(), GetHpenOf(pen));
         if ( hpen == HGDI_ERROR )


@@ -1559,19 +1584,19 @@ void wxDC::SetPen(const wxPen& pen)
     }
 }
 
     }
 }
 

-void wxDC::SetBrush(const wxBrush& brush)
+void wxMSWDCImpl::SetBrush(const wxBrush& brush)

 {
     WXMICROWIN_CHECK_HDC
 
     if ( brush == m_brush )
         return;
 
 {
     WXMICROWIN_CHECK_HDC
 
     if ( brush == m_brush )
         return;
 

-    if ( brush.Ok() )
+    if ( brush.IsOk() )

     {
         // we must make sure the brush is aligned with the logical coordinates
         // before selecting it
         wxBitmap *stipple = brush.GetStipple();
     {
         // we must make sure the brush is aligned with the logical coordinates
         // before selecting it
         wxBitmap *stipple = brush.GetStipple();

-        if ( stipple && stipple->Ok() )
+        if ( stipple && stipple->IsOk() )

         {
             if ( !::SetBrushOrgEx
                     (
         {
             if ( !::SetBrushOrgEx
                     (


@@ -1614,19 +1639,19 @@ void wxDC::SetBrush(const wxBrush& brush)
     }
 }
 
     }
 }
 

-void wxDC::SetBackground(const wxBrush& brush)
+void wxMSWDCImpl::SetBackground(const wxBrush& brush)

 {
     WXMICROWIN_CHECK_HDC
 
     m_backgroundBrush = brush;
 
 {
     WXMICROWIN_CHECK_HDC
 
     m_backgroundBrush = brush;
 

-    if ( m_backgroundBrush.Ok() )
+    if ( m_backgroundBrush.IsOk() )

     {
         (void)SetBkColor(GetHdc(), m_backgroundBrush.GetColour().GetPixel());
     }
 }
 
     {
         (void)SetBkColor(GetHdc(), m_backgroundBrush.GetColour().GetPixel());
     }
 }
 

-void wxDC::SetBackgroundMode(int mode)
+void wxMSWDCImpl::SetBackgroundMode(int mode)

 {
     WXMICROWIN_CHECK_HDC
 
 {
     WXMICROWIN_CHECK_HDC
 


@@ -1636,7 +1661,7 @@ void wxDC::SetBackgroundMode(int mode)
     // and m_backgroundMode is used there
 }
 
     // and m_backgroundMode is used there
 }
 

-void wxDC::SetLogicalFunction(int function)
+void wxMSWDCImpl::SetLogicalFunction(int function)

 {
     WXMICROWIN_CHECK_HDC
 
 {
     WXMICROWIN_CHECK_HDC
 


@@ -1645,7 +1670,7 @@ void wxDC::SetLogicalFunction(int function)
     SetRop(m_hDC);
 }
 
     SetRop(m_hDC);
 }
 

-void wxDC::SetRop(WXHDC dc)
+void wxMSWDCImpl::SetRop(WXHDC dc)

 {
     if ( !dc || m_logicalFunction < 0 )
         return;
 {
     if ( !dc || m_logicalFunction < 0 )
         return;


@@ -1679,21 +1704,21 @@ void wxDC::SetRop(WXHDC dc)
     SetROP2(GetHdc(), rop);
 }
 
     SetROP2(GetHdc(), rop);
 }
 

-bool wxDC::StartDoc(const wxString& WXUNUSED(message))
+bool wxMSWDCImpl::StartDoc(const wxString& WXUNUSED(message))

 {
     // We might be previewing, so return true to let it continue.
     return true;
 }
 
 {
     // We might be previewing, so return true to let it continue.
     return true;
 }
 

-void wxDC::EndDoc()
+void wxMSWDCImpl::EndDoc()

 {
 }
 
 {
 }
 

-void wxDC::StartPage()
+void wxMSWDCImpl::StartPage()

 {
 }
 
 {
 }
 

-void wxDC::EndPage()
+void wxMSWDCImpl::EndPage()

 {
 }
 
 {
 }
 


@@ -1701,7 +1726,7 @@ void wxDC::EndPage()
 // text metrics
 // ---------------------------------------------------------------------------
 
 // text metrics
 // ---------------------------------------------------------------------------
 

-wxCoord wxDC::GetCharHeight() const
+wxCoord wxMSWDCImpl::GetCharHeight() const

 {
     WXMICROWIN_CHECK_HDC_RET(0)
 
 {
     WXMICROWIN_CHECK_HDC_RET(0)
 


@@ -1712,7 +1737,7 @@ wxCoord wxDC::GetCharHeight() const
     return lpTextMetric.tmHeight;
 }
 
     return lpTextMetric.tmHeight;
 }
 

-wxCoord wxDC::GetCharWidth() const
+wxCoord wxMSWDCImpl::GetCharWidth() const

 {
     WXMICROWIN_CHECK_HDC_RET(0)
 
 {
     WXMICROWIN_CHECK_HDC_RET(0)
 


@@ -1723,7 +1748,7 @@ wxCoord wxDC::GetCharWidth() const
     return lpTextMetric.tmAveCharWidth;
 }
 
     return lpTextMetric.tmAveCharWidth;
 }
 

-void wxDC::DoGetTextExtent(const wxString& string, wxCoord *x, wxCoord *y,
+void wxMSWDCImpl::DoGetTextExtent(const wxString& string, wxCoord *x, wxCoord *y,

                            wxCoord *descent, wxCoord *externalLeading,
                            const wxFont *font) const
 {
                            wxCoord *descent, wxCoord *externalLeading,
                            const wxFont *font) const
 {


@@ -1741,7 +1766,7 @@ void wxDC::DoGetTextExtent(const wxString& string, wxCoord *x, wxCoord *y,
     HFONT hfontOld;
     if ( font )
     {
     HFONT hfontOld;
     if ( font )
     {

-        wxASSERT_MSG( font->Ok(), _T("invalid font in wxDC::GetTextExtent") );
+        wxASSERT_MSG( font->IsOk(), _T("invalid font in wxMSWDCImpl::GetTextExtent") );

 
         hfontOld = (HFONT)::SelectObject(GetHdc(), GetHfontOf(*font));
     }
 
         hfontOld = (HFONT)::SelectObject(GetHdc(), GetHfontOf(*font));
     }


@@ -1807,7 +1832,7 @@ void wxDC::DoGetTextExtent(const wxString& string, wxCoord *x, wxCoord *y,
 // Each element of the array will be the width of the string up to and
 // including the coresoponding character in text.
 
 // Each element of the array will be the width of the string up to and
 // including the coresoponding character in text.
 

-bool wxDC::DoGetPartialTextExtents(const wxString& text, wxArrayInt& widths) const
+bool wxMSWDCImpl::DoGetPartialTextExtents(const wxString& text, wxArrayInt& widths) const

 {
     static int maxLenText = -1;
     static int maxWidth = -1;
 {
     static int maxLenText = -1;
     static int maxWidth = -1;


@@ -1845,7 +1870,7 @@ bool wxDC::DoGetPartialTextExtents(const wxString& text, wxArrayInt& widths) con
     return true;
 }
 
     return true;
 }
 

-void wxDC::RealizeScaleAndOrigin()
+void wxMSWDCImpl::RealizeScaleAndOrigin()

 {
     // VZ: it seems very wasteful to always use MM_ANISOTROPIC when in 99% of
     //     cases we could do with MM_TEXT and in the remaining 0.9% with
 {
     // VZ: it seems very wasteful to always use MM_ANISOTROPIC when in 99% of
     //     cases we could do with MM_TEXT and in the remaining 0.9% with


@@ -1862,10 +1887,9 @@ void wxDC::RealizeScaleAndOrigin()
     ::SetViewportOrgEx(GetHdc(), m_deviceOriginX, m_deviceOriginY, NULL);
     ::SetWindowOrgEx(GetHdc(), m_logicalOriginX, m_logicalOriginY, NULL);
 #endif
     ::SetViewportOrgEx(GetHdc(), m_deviceOriginX, m_deviceOriginY, NULL);
     ::SetWindowOrgEx(GetHdc(), m_logicalOriginX, m_logicalOriginY, NULL);
 #endif

-    

 }
 
 }
 

-void wxDC::SetMapMode(int mode)
+void wxMSWDCImpl::SetMapMode(int mode)

 {
     WXMICROWIN_CHECK_HDC
 
 {
     WXMICROWIN_CHECK_HDC
 


@@ -1918,62 +1942,62 @@ void wxDC::SetMapMode(int mode)
                 wxFAIL_MSG( _T("unknown mapping mode in SetMapMode") );
         }
     }
                 wxFAIL_MSG( _T("unknown mapping mode in SetMapMode") );
         }
     }

-    
+

     ComputeScaleAndOrigin();
     ComputeScaleAndOrigin();

-    
+

     RealizeScaleAndOrigin();
 }
 
     RealizeScaleAndOrigin();
 }
 

-void wxDC::SetUserScale(double x, double y)
+void wxMSWDCImpl::SetUserScale(double x, double y)

 {
     WXMICROWIN_CHECK_HDC
 
     if ( x == m_userScaleX && y == m_userScaleY )
         return;
 
 {
     WXMICROWIN_CHECK_HDC
 
     if ( x == m_userScaleX && y == m_userScaleY )
         return;
 

-    wxDCBase::SetUserScale(x,y);
-    
+    wxDCImpl::SetUserScale(x,y);
+

     RealizeScaleAndOrigin();
 }
 
     RealizeScaleAndOrigin();
 }
 

-void wxDC::SetAxisOrientation(bool xLeftRight,
+void wxMSWDCImpl::SetAxisOrientation(bool xLeftRight,

                               bool yBottomUp)
 {
     WXMICROWIN_CHECK_HDC
 
     int signX = xLeftRight ? 1 : -1,
         signY = yBottomUp ? -1 : 1;
                               bool yBottomUp)
 {
     WXMICROWIN_CHECK_HDC
 
     int signX = xLeftRight ? 1 : -1,
         signY = yBottomUp ? -1 : 1;

-        
+

     if (signX == m_signX && signY == m_signY)
         return;
     if (signX == m_signX && signY == m_signY)
         return;

-    
-    wxDCBase::SetAxisOrientation( xLeftRight, yBottomUp );
+
+    wxDCImpl::SetAxisOrientation( xLeftRight, yBottomUp );

 
     RealizeScaleAndOrigin();
 }
 
 
     RealizeScaleAndOrigin();
 }
 

-void wxDC::SetLogicalOrigin(wxCoord x, wxCoord y)
+void wxMSWDCImpl::SetLogicalOrigin(wxCoord x, wxCoord y)

 {
     WXMICROWIN_CHECK_HDC
 
     if ( x == m_logicalOriginX && y == m_logicalOriginY )
         return;
 
 {
     WXMICROWIN_CHECK_HDC
 
     if ( x == m_logicalOriginX && y == m_logicalOriginY )
         return;
 

-    wxDCBase::SetLogicalOrigin( x, y );
+    wxDCImpl::SetLogicalOrigin( x, y );

 
 #ifndef __WXWINCE__
     ::SetWindowOrgEx(GetHdc(), (int)m_logicalOriginX, (int)m_logicalOriginY, NULL);
 #endif
 }
 
 
 #ifndef __WXWINCE__
     ::SetWindowOrgEx(GetHdc(), (int)m_logicalOriginX, (int)m_logicalOriginY, NULL);
 #endif
 }
 

-void wxDC::SetDeviceOrigin(wxCoord x, wxCoord y)
+void wxMSWDCImpl::SetDeviceOrigin(wxCoord x, wxCoord y)

 {
     WXMICROWIN_CHECK_HDC
 
     if ( x == m_deviceOriginX && y == m_deviceOriginY )
         return;
 {
     WXMICROWIN_CHECK_HDC
 
     if ( x == m_deviceOriginX && y == m_deviceOriginY )
         return;

-        
-    wxDCBase::SetDeviceOrigin( x, y );
+
+    wxDCImpl::SetDeviceOrigin( x, y );

 
     ::SetViewportOrgEx(GetHdc(), (int)m_deviceOriginX, (int)m_deviceOriginY, NULL);
 }
 
     ::SetViewportOrgEx(GetHdc(), (int)m_deviceOriginX, (int)m_deviceOriginY, NULL);
 }


@@ -1982,7 +2006,7 @@ void wxDC::SetDeviceOrigin(wxCoord x, wxCoord y)
 // bit blit
 // ---------------------------------------------------------------------------
 
 // bit blit
 // ---------------------------------------------------------------------------
 

-bool wxDC::DoBlit(wxCoord dstX, wxCoord dstY,
+bool wxMSWDCImpl::DoBlit(wxCoord dstX, wxCoord dstY,

                   wxCoord dstWidth, wxCoord dstHeight,
                   wxDC *source,
                   wxCoord srcX, wxCoord srcY,
                   wxCoord dstWidth, wxCoord dstHeight,
                   wxDC *source,
                   wxCoord srcX, wxCoord srcY,


@@ -1992,7 +2016,7 @@ bool wxDC::DoBlit(wxCoord dstX, wxCoord dstY,
     return DoStretchBlit(dstX, dstY, dstWidth, dstHeight, source, srcX, srcY, dstWidth, dstHeight, rop, useMask, srcMaskX, srcMaskY);
 }
 
     return DoStretchBlit(dstX, dstY, dstWidth, dstHeight, source, srcX, srcY, dstWidth, dstHeight, rop, useMask, srcMaskX, srcMaskY);
 }
 

-bool wxDC::DoStretchBlit(wxCoord xdest, wxCoord ydest,
+bool wxMSWDCImpl::DoStretchBlit(wxCoord xdest, wxCoord ydest,

                          wxCoord dstWidth, wxCoord dstHeight,
                          wxDC *source,
                          wxCoord xsrc, wxCoord ysrc,
                          wxCoord dstWidth, wxCoord dstHeight,
                          wxDC *source,
                          wxCoord xsrc, wxCoord ysrc,


@@ -2000,18 +2024,27 @@ bool wxDC::DoStretchBlit(wxCoord xdest, wxCoord ydest,
                          int rop, bool useMask,
                          wxCoord xsrcMask, wxCoord ysrcMask)
 {
                          int rop, bool useMask,
                          wxCoord xsrcMask, wxCoord ysrcMask)
 {

-    wxCHECK_MSG( source, false, _T("wxDC::Blit(): NULL wxDC pointer") );
+    wxCHECK_MSG( source, false, _T("wxMSWDCImpl::Blit(): NULL wxDC pointer") );

 
     WXMICROWIN_CHECK_HDC_RET(false)
 
 
     WXMICROWIN_CHECK_HDC_RET(false)
 

+    wxMSWDCImpl *implSrc = wxDynamicCast( source->GetImpl(), wxMSWDCImpl );
+    if ( !implSrc )
+    {
+        // TODO: Do we want to be able to blit from other DCs too?
+        return false;
+    }
+
+    const HDC hdcSrc = GetHdcOf(*implSrc);
+

     // if either the source or destination has alpha channel, we must use
     // AlphaBlt() as other function don't handle it correctly
     // if either the source or destination has alpha channel, we must use
     // AlphaBlt() as other function don't handle it correctly

-    const wxBitmap& bmpSrc = source->m_selectedBitmap;
-    if ( bmpSrc.Ok() && (bmpSrc.HasAlpha() ||
-            (m_selectedBitmap.Ok() && m_selectedBitmap.HasAlpha())) )
+    const wxBitmap& bmpSrc = implSrc->GetSelectedBitmap();
+    if ( bmpSrc.IsOk() && (bmpSrc.HasAlpha() ||
+            (m_selectedBitmap.IsOk() && m_selectedBitmap.HasAlpha())) )

     {
         if ( AlphaBlt(GetHdc(), xdest, ydest, dstWidth, dstHeight,
     {
         if ( AlphaBlt(GetHdc(), xdest, ydest, dstWidth, dstHeight,

-                      xsrc, ysrc, srcWidth, srcHeight, GetHdcOf(*source), bmpSrc) )
+                      xsrc, ysrc, srcWidth, srcHeight, hdcSrc, bmpSrc) )

             return true;
     }
 
             return true;
     }
 


@@ -2020,7 +2053,7 @@ bool wxDC::DoStretchBlit(wxCoord xdest, wxCoord ydest,
     {
         mask = bmpSrc.GetMask();
 
     {
         mask = bmpSrc.GetMask();
 

-        if ( !(bmpSrc.Ok() && mask && mask->GetMaskBitmap()) )
+        if ( !(bmpSrc.IsOk() && mask && mask->GetMaskBitmap()) )

         {
             // don't give assert here because this would break existing
             // programs - just silently ignore useMask parameter
         {
             // don't give assert here because this would break existing
             // programs - just silently ignore useMask parameter


@@ -2035,11 +2068,11 @@ bool wxDC::DoStretchBlit(wxCoord xdest, wxCoord ydest,
 
     COLORREF old_textground = ::GetTextColor(GetHdc());
     COLORREF old_background = ::GetBkColor(GetHdc());
 
     COLORREF old_textground = ::GetTextColor(GetHdc());
     COLORREF old_background = ::GetBkColor(GetHdc());

-    if (m_textForegroundColour.Ok())
+    if (m_textForegroundColour.IsOk())

     {
         ::SetTextColor(GetHdc(), m_textForegroundColour.GetPixel() );
     }
     {
         ::SetTextColor(GetHdc(), m_textForegroundColour.GetPixel() );
     }

-    if (m_textBackgroundColour.Ok())
+    if (m_textBackgroundColour.IsOk())

     {
         ::SetBkColor(GetHdc(), m_textBackgroundColour.GetPixel() );
     }
     {
         ::SetBkColor(GetHdc(), m_textBackgroundColour.GetPixel() );
     }


@@ -2091,7 +2124,7 @@ bool wxDC::DoStretchBlit(wxCoord xdest, wxCoord ydest,
                             (
                             GetHdc(),
                             xdest, ydest, dstWidth, dstHeight,
                             (
                             GetHdc(),
                             xdest, ydest, dstWidth, dstHeight,

-                            GetHdcOf(*source),
+                            hdcSrc,

                             xsrc, ysrc,
                             (HBITMAP)mask->GetMaskBitmap(),
                             xsrcMask, ysrcMask,
                             xsrc, ysrc,
                             (HBITMAP)mask->GetMaskBitmap(),
                             xsrcMask, ysrcMask,


@@ -2110,7 +2143,7 @@ bool wxDC::DoStretchBlit(wxCoord xdest, wxCoord ydest,
 
 #if wxUSE_DC_CACHEING
             // create a temp buffer bitmap and DCs to access it and the mask
 
 #if wxUSE_DC_CACHEING
             // create a temp buffer bitmap and DCs to access it and the mask

-            wxDCCacheEntry* dcCacheEntry1 = FindDCInCache(NULL, source->GetHDC());
+            wxDCCacheEntry* dcCacheEntry1 = FindDCInCache(NULL, hdcSrc);

             dc_mask = (HDC) dcCacheEntry1->m_dc;
 
             wxDCCacheEntry* dcCacheEntry2 = FindDCInCache(dcCacheEntry1, GetHDC());
             dc_mask = (HDC) dcCacheEntry1->m_dc;
 
             wxDCCacheEntry* dcCacheEntry2 = FindDCInCache(dcCacheEntry1, GetHDC());


@@ -2122,7 +2155,7 @@ bool wxDC::DoStretchBlit(wxCoord xdest, wxCoord ydest,
             buffer_bmap = (HBITMAP) bitmapCacheEntry->m_bitmap;
 #else // !wxUSE_DC_CACHEING
             // create a temp buffer bitmap and DCs to access it and the mask
             buffer_bmap = (HBITMAP) bitmapCacheEntry->m_bitmap;
 #else // !wxUSE_DC_CACHEING
             // create a temp buffer bitmap and DCs to access it and the mask

-            dc_mask = ::CreateCompatibleDC(GetHdcOf(*source));
+            dc_mask = ::CreateCompatibleDC(hdcSrc);

             dc_buffer = ::CreateCompatibleDC(GetHdc());
             buffer_bmap = ::CreateCompatibleBitmap(GetHdc(), dstWidth, dstHeight);
 #endif // wxUSE_DC_CACHEING/!wxUSE_DC_CACHEING
             dc_buffer = ::CreateCompatibleDC(GetHdc());
             buffer_bmap = ::CreateCompatibleBitmap(GetHdc(), dstWidth, dstHeight);
 #endif // wxUSE_DC_CACHEING/!wxUSE_DC_CACHEING


@@ -2142,7 +2175,7 @@ bool wxDC::DoStretchBlit(wxCoord xdest, wxCoord ydest,
 
             // copy src to buffer using selected raster op
             if ( !::StretchBlt(dc_buffer, 0, 0, (int)dstWidth, (int)dstHeight,
 
             // copy src to buffer using selected raster op
             if ( !::StretchBlt(dc_buffer, 0, 0, (int)dstWidth, (int)dstHeight,

-                           GetHdcOf(*source), xsrc, ysrc, srcWidth, srcHeight, dwRop) )
+                               hdcSrc, xsrc, ysrc, srcWidth, srcHeight, dwRop) )

             {
                 wxLogLastError(wxT("StretchBlt"));
             }
             {
                 wxLogLastError(wxT("StretchBlt"));
             }


@@ -2197,7 +2230,7 @@ bool wxDC::DoStretchBlit(wxCoord xdest, wxCoord ydest,
         // FIXME: use appropriate WinCE functions
 #ifndef __WXWINCE__
         const int caps = ::GetDeviceCaps(GetHdc(), RASTERCAPS);
         // FIXME: use appropriate WinCE functions
 #ifndef __WXWINCE__
         const int caps = ::GetDeviceCaps(GetHdc(), RASTERCAPS);

-        if ( bmpSrc.Ok() && (caps & RC_STRETCHDIB) )
+        if ( bmpSrc.IsOk() && (caps & RC_STRETCHDIB) )

         {
             DIBSECTION ds;
             wxZeroMemory(ds);
         {
             DIBSECTION ds;
             wxZeroMemory(ds);


@@ -2253,7 +2286,7 @@ bool wxDC::DoStretchBlit(wxCoord xdest, wxCoord ydest,
                     (
                         GetHdc(),
                         xdest, ydest, dstWidth, dstHeight,
                     (
                         GetHdc(),
                         xdest, ydest, dstWidth, dstHeight,

-                        GetHdcOf(*source),
+                        hdcSrc,

                         xsrc, ysrc, srcWidth, srcHeight,
                         dwRop
                     ) )
                         xsrc, ysrc, srcWidth, srcHeight,
                         dwRop
                     ) )


@@ -2273,7 +2306,7 @@ bool wxDC::DoStretchBlit(wxCoord xdest, wxCoord ydest,
                         GetHdc(),
                         xdest, ydest,
                         (int)dstWidth, (int)dstHeight,
                         GetHdc(),
                         xdest, ydest,
                         (int)dstWidth, (int)dstHeight,

-                        GetHdcOf(*source),
+                        hdcSrc,

                         xsrc, ysrc,
                         dwRop
                     ) )
                         xsrc, ysrc,
                         dwRop
                     ) )


@@ -2293,7 +2326,7 @@ bool wxDC::DoStretchBlit(wxCoord xdest, wxCoord ydest,
     return success;
 }
 
     return success;
 }
 

-void wxDC::GetDeviceSize(int *width, int *height) const
+void wxMSWDCImpl::GetDeviceSize(int *width, int *height) const

 {
     WXMICROWIN_CHECK_HDC
 
 {
     WXMICROWIN_CHECK_HDC
 


@@ -2303,7 +2336,7 @@ void wxDC::GetDeviceSize(int *width, int *height) const
         *height = ::GetDeviceCaps(GetHdc(), VERTRES);
 }
 
         *height = ::GetDeviceCaps(GetHdc(), VERTRES);
 }
 

-void wxDC::DoGetSizeMM(int *w, int *h) const
+void wxMSWDCImpl::DoGetSizeMM(int *w, int *h) const

 {
     WXMICROWIN_CHECK_HDC
 
 {
     WXMICROWIN_CHECK_HDC
 


@@ -2333,7 +2366,7 @@ void wxDC::DoGetSizeMM(int *w, int *h) const
     }
 }
 
     }
 }
 

-wxSize wxDC::GetPPI() const
+wxSize wxMSWDCImpl::GetPPI() const

 {
     WXMICROWIN_CHECK_HDC_RET(wxSize(0,0))
 
 {
     WXMICROWIN_CHECK_HDC_RET(wxSize(0,0))
 


@@ -2344,11 +2377,11 @@ wxSize wxDC::GetPPI() const
 }
 
 // For use by wxWidgets only, unless custom units are required.
 }
 
 // For use by wxWidgets only, unless custom units are required.

-void wxDC::SetLogicalScale(double x, double y)
+void wxMSWDCImpl::SetLogicalScale(double x, double y)

 {
     WXMICROWIN_CHECK_HDC
 
 {
     WXMICROWIN_CHECK_HDC
 

-    wxDCBase::SetLogicalScale(x,y);
+    wxDCImpl::SetLogicalScale(x,y);

 }
 
 // ----------------------------------------------------------------------------
 }
 
 // ----------------------------------------------------------------------------


@@ -2363,8 +2396,8 @@ void wxDC::SetLogicalScale(double x, double y)
  * entry for the bitmap, and two for the DCs. -- JACS
  */
 
  * entry for the bitmap, and two for the DCs. -- JACS
  */
 

-wxList wxDC::sm_bitmapCache;
-wxList wxDC::sm_dcCache;
+wxObjectList wxMSWDCImpl::sm_bitmapCache;
+wxObjectList wxMSWDCImpl::sm_dcCache;

 
 wxDCCacheEntry::wxDCCacheEntry(WXHBITMAP hBitmap, int w, int h, int depth)
 {
 
 wxDCCacheEntry::wxDCCacheEntry(WXHBITMAP hBitmap, int w, int h, int depth)
 {


@@ -2392,7 +2425,7 @@ wxDCCacheEntry::~wxDCCacheEntry()
         ::DeleteDC((HDC) m_dc);
 }
 
         ::DeleteDC((HDC) m_dc);
 }
 

-wxDCCacheEntry* wxDC::FindBitmapInCache(WXHDC dc, int w, int h)
+wxDCCacheEntry* wxMSWDCImpl::FindBitmapInCache(WXHDC dc, int w, int h)

 {
     int depth = ::GetDeviceCaps((HDC) dc, PLANES) * ::GetDeviceCaps((HDC) dc, BITSPIXEL);
     wxList::compatibility_iterator node = sm_bitmapCache.GetFirst();
 {
     int depth = ::GetDeviceCaps((HDC) dc, PLANES) * ::GetDeviceCaps((HDC) dc, BITSPIXEL);
     wxList::compatibility_iterator node = sm_bitmapCache.GetFirst();


@@ -2428,7 +2461,7 @@ wxDCCacheEntry* wxDC::FindBitmapInCache(WXHDC dc, int w, int h)
     return entry;
 }
 
     return entry;
 }
 

-wxDCCacheEntry* wxDC::FindDCInCache(wxDCCacheEntry* notThis, WXHDC dc)
+wxDCCacheEntry* wxMSWDCImpl::FindDCInCache(wxDCCacheEntry* notThis, WXHDC dc)

 {
     int depth = ::GetDeviceCaps((HDC) dc, PLANES) * ::GetDeviceCaps((HDC) dc, BITSPIXEL);
     wxList::compatibility_iterator node = sm_dcCache.GetFirst();
 {
     int depth = ::GetDeviceCaps((HDC) dc, PLANES) * ::GetDeviceCaps((HDC) dc, BITSPIXEL);
     wxList::compatibility_iterator node = sm_dcCache.GetFirst();


@@ -2457,17 +2490,17 @@ wxDCCacheEntry* wxDC::FindDCInCache(wxDCCacheEntry* notThis, WXHDC dc)
     return entry;
 }
 
     return entry;
 }
 

-void wxDC::AddToBitmapCache(wxDCCacheEntry* entry)
+void wxMSWDCImpl::AddToBitmapCache(wxDCCacheEntry* entry)

 {
     sm_bitmapCache.Append(entry);
 }
 
 {
     sm_bitmapCache.Append(entry);
 }
 

-void wxDC::AddToDCCache(wxDCCacheEntry* entry)
+void wxMSWDCImpl::AddToDCCache(wxDCCacheEntry* entry)

 {
     sm_dcCache.Append(entry);
 }
 
 {
     sm_dcCache.Append(entry);
 }
 

-void wxDC::ClearCache()
+void wxMSWDCImpl::ClearCache()

 {
     WX_CLEAR_LIST(wxList, sm_dcCache);
     WX_CLEAR_LIST(wxList, sm_bitmapCache);
 {
     WX_CLEAR_LIST(wxList, sm_dcCache);
     WX_CLEAR_LIST(wxList, sm_bitmapCache);


@@ -2478,7 +2511,7 @@ class wxDCModule : public wxModule
 {
 public:
     virtual bool OnInit() { return true; }
 {
 public:
     virtual bool OnInit() { return true; }

-    virtual void OnExit() { wxDC::ClearCache(); }
+    virtual void OnExit() { wxMSWDCImpl::ClearCache(); }

 
 private:
     DECLARE_DYNAMIC_CLASS(wxDCModule)
 
 private:
     DECLARE_DYNAMIC_CLASS(wxDCModule)


@@ -2494,12 +2527,12 @@ IMPLEMENT_DYNAMIC_CLASS(wxDCModule, wxModule)
 
 static bool AlphaBlt(HDC hdcDst,
                      int x, int y, int dstWidth, int dstHeight,
 
 static bool AlphaBlt(HDC hdcDst,
                      int x, int y, int dstWidth, int dstHeight,

-                     int srcX, int srcY, 
+                     int srcX, int srcY,

                      int srcWidth, int srcHeight,
                      HDC hdcSrc,
                      const wxBitmap& bmp)
 {
                      int srcWidth, int srcHeight,
                      HDC hdcSrc,
                      const wxBitmap& bmp)
 {

-    wxASSERT_MSG( bmp.Ok() && bmp.HasAlpha(), _T("AlphaBlt(): invalid bitmap") );
+    wxASSERT_MSG( bmp.IsOk() && bmp.HasAlpha(), _T("AlphaBlt(): invalid bitmap") );

     wxASSERT_MSG( hdcDst && hdcSrc, _T("AlphaBlt(): invalid HDC") );
 
     // do we have AlphaBlend() and company in the headers?
     wxASSERT_MSG( hdcDst && hdcSrc, _T("AlphaBlt(): invalid HDC") );
 
     // do we have AlphaBlend() and company in the headers?


@@ -2554,7 +2587,7 @@ static bool AlphaBlt(HDC hdcDst,
 static void
 wxAlphaBlend(HDC hdcDst, int xDst, int yDst,
              int dstWidth, int dstHeight,
 static void
 wxAlphaBlend(HDC hdcDst, int xDst, int yDst,
              int dstWidth, int dstHeight,

-             int srcX, int srcY, 
+             int srcX, int srcY,

              int srcWidth, int srcHeight,
              const wxBitmap& bmpSrc)
 {
              int srcWidth, int srcHeight,
              const wxBitmap& bmpSrc)
 {


@@ -2613,7 +2646,7 @@ wxAlphaBlend(HDC hdcDst, int xDst, int yDst,
 
 #endif // #ifdef wxHAVE_RAW_BITMAP
 
 
 #endif // #ifdef wxHAVE_RAW_BITMAP
 

-void wxDC::DoGradientFillLinear (const wxRect& rect,
+void wxMSWDCImpl::DoGradientFillLinear (const wxRect& rect,

                                  const wxColour& initialColour,
                                  const wxColour& destColour,
                                  wxDirection nDirection)
                                  const wxColour& initialColour,
                                  const wxColour& destColour,
                                  wxDirection nDirection)


@@ -2674,7 +2707,7 @@ void wxDC::DoGradientFillLinear (const wxRect& rect,
     }
 #endif // wxUSE_DYNLIB_CLASS
 
     }
 #endif // wxUSE_DYNLIB_CLASS
 

-    wxDCBase::DoGradientFillLinear(rect, initialColour, destColour, nDirection);
+    wxDCImpl::DoGradientFillLinear(rect, initialColour, destColour, nDirection);

 }
 
 #if wxUSE_DYNLIB_CLASS
 }
 
 #if wxUSE_DYNLIB_CLASS


@@ -2683,12 +2716,12 @@ static DWORD wxGetDCLayout(HDC hdc)
 {
     typedef DWORD (WINAPI *GetLayout_t)(HDC);
     static GetLayout_t
 {
     typedef DWORD (WINAPI *GetLayout_t)(HDC);
     static GetLayout_t

-        pfnGetLayout = (GetLayout_t)wxGDI32DLL.GetSymbol(_T("GetLayout"));
+        wxDL_INIT_FUNC(s_pfn, GetLayout, wxDynamicLibrary(_T("gdi32.dll")));

 
 

-    return pfnGetLayout ? pfnGetLayout(hdc) : (DWORD)-1;
+    return s_pfnGetLayout ? s_pfnGetLayout(hdc) : (DWORD)-1;

 }
 
 }
 

-wxLayoutDirection wxDC::GetLayoutDirection() const
+wxLayoutDirection wxMSWDCImpl::GetLayoutDirection() const

 {
     DWORD layout = wxGetDCLayout(GetHdc());
 
 {
     DWORD layout = wxGetDCLayout(GetHdc());
 


@@ -2698,12 +2731,12 @@ wxLayoutDirection wxDC::GetLayoutDirection() const
     return layout & LAYOUT_RTL ? wxLayout_RightToLeft : wxLayout_LeftToRight;
 }
 
     return layout & LAYOUT_RTL ? wxLayout_RightToLeft : wxLayout_LeftToRight;
 }
 

-void wxDC::SetLayoutDirection(wxLayoutDirection dir)
+void wxMSWDCImpl::SetLayoutDirection(wxLayoutDirection dir)

 {
     typedef DWORD (WINAPI *SetLayout_t)(HDC, DWORD);
     static SetLayout_t
 {
     typedef DWORD (WINAPI *SetLayout_t)(HDC, DWORD);
     static SetLayout_t

-        pfnSetLayout = (SetLayout_t)wxGDI32DLL.GetSymbol(_T("SetLayout"));
-    if ( !pfnSetLayout )
+        wxDL_INIT_FUNC(s_pfn, SetLayout, wxDynamicLibrary(_T("gdi32.dll")));
+    if ( !s_pfnSetLayout )

         return;
 
     if ( dir == wxLayout_Default )
         return;
 
     if ( dir == wxLayout_Default )


@@ -2719,18 +2752,18 @@ void wxDC::SetLayoutDirection(wxLayoutDirection dir)
     else
         layout &= ~LAYOUT_RTL;
 
     else
         layout &= ~LAYOUT_RTL;
 

-    pfnSetLayout(GetHdc(), layout);
+    s_pfnSetLayout(GetHdc(), layout);

 }
 
 #else // !wxUSE_DYNLIB_CLASS
 
 // we can't provide RTL support without dynamic loading, so stub it out
 }
 
 #else // !wxUSE_DYNLIB_CLASS
 
 // we can't provide RTL support without dynamic loading, so stub it out

-wxLayoutDirection wxDC::GetLayoutDirection() const
+wxLayoutDirection wxMSWDCImpl::GetLayoutDirection() const

 {
     return wxLayout_Default;
 }
 
 {
     return wxLayout_Default;
 }
 

-void wxDC::SetLayoutDirection(wxLayoutDirection WXUNUSED(dir))
+void wxMSWDCImpl::SetLayoutDirection(wxLayoutDirection WXUNUSED(dir))

 {
 }
 
 {
 }