X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/621b83d9b34572321873cf3d54920a7749b2f53c..83666e99093aa0b65c497f7e6c75d98a875667cc:/src/msw/dc.cpp

diff --git a/src/msw/dc.cpp b/src/msw/dc.cpp
index d13264eec0..d878f66645 100644
--- 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/dc.h"
     #include "wx/utils.h"
     #include "wx/dialog.h"
     #include "wx/app.h"
@@ -40,10 +39,11 @@
     #include "wx/module.h"
 #endif
 
+#include "wx/msw/dc.h"
 #include "wx/sysopt.h"
 #include "wx/dynlib.h"
 
-#ifdef wxHAVE_RAW_BITMAP
+#ifdef wxHAS_RAW_BITMAP
 #include "wx/rawbmp.h"
 #endif
 
@@ -76,7 +76,7 @@
     #define WXMICROWIN_CHECK_HDC_RET(x)
 #endif
 
-IMPLEMENT_ABSTRACT_CLASS(wxDC, wxDCBase)
+IMPLEMENT_ABSTRACT_CLASS(wxMSWDCImpl, wxDCImpl)
 
 // ---------------------------------------------------------------------------
 // constants
@@ -84,9 +84,6 @@ IMPLEMENT_ABSTRACT_CLASS(wxDC, wxDCBase)
 
 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
@@ -131,47 +128,154 @@ 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,
-                     int srcX, int srcY, 
+                     int srcX, int srcY,
                      int srcWidth, int srcHeight,
                      HDC hdcSrc,
                      const wxBitmap& bmp);
 
-#ifdef wxHAVE_RAW_BITMAP
+#ifdef wxHAS_RAW_BITMAP
 
 // our (limited) AlphaBlend() replacement for Windows versions not providing it
 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);
 
-#endif // wxHAVE_RAW_BITMAP
+#endif // wxHAS_RAW_BITMAP
 
 // ----------------------------------------------------------------------------
 // private classes
 // ----------------------------------------------------------------------------
 
+// various classes to change some DC property temporarily
+
+// text background and foreground colours
+class wxTextColoursChanger
+{
+public:
+    wxTextColoursChanger(HDC hdc, const wxMSWDCImpl& dc)
+        : m_hdc(hdc)
+    {
+        Change(dc.GetTextForeground(), dc.GetTextBackground());
+    }
+
+    wxTextColoursChanger(HDC hdc, const wxColour& colFg, const wxColour& colBg)
+        : m_hdc(hdc)
+    {
+        Change(colFg, colBg);
+    }
+
+    ~wxTextColoursChanger()
+    {
+        if ( m_oldColFg != CLR_INVALID )
+            ::SetTextColor(m_hdc, m_oldColFg);
+        if ( m_oldColBg != CLR_INVALID )
+            ::SetBkColor(m_hdc, m_oldColBg);
+    }
+
+protected:
+    // this ctor doesn't change mode immediately, call Change() later to do it
+    // only if needed
+    wxTextColoursChanger(HDC hdc)
+        : m_hdc(hdc)
+    {
+        m_oldColFg =
+        m_oldColBg = CLR_INVALID;
+    }
+
+    void Change(const wxColour& colFg, const wxColour& colBg)
+    {
+        if ( colFg.IsOk() )
+        {
+            m_oldColFg = ::SetTextColor(m_hdc, colFg.GetPixel());
+            if ( m_oldColFg == CLR_INVALID )
+            {
+                wxLogLastError(_T("SetTextColor"));
+            }
+        }
+        else
+        {
+            m_oldColFg = CLR_INVALID;
+        }
+
+        if ( colBg.IsOk() )
+        {
+            m_oldColBg = ::SetBkColor(m_hdc, colBg.GetPixel());
+            if ( m_oldColBg == CLR_INVALID )
+            {
+                wxLogLastError(_T("SetBkColor"));
+            }
+        }
+        else
+        {
+            m_oldColBg = CLR_INVALID;
+        }
+    }
+
+private:
+    const HDC m_hdc;
+    COLORREF m_oldColFg,
+             m_oldColBg;
+
+    DECLARE_NO_COPY_CLASS(wxTextColoursChanger)
+};
+
+// background mode
+class wxBkModeChanger
+{
+public:
+    // set background mode to opaque if mode != wxBRUSHSTYLE_TRANSPARENT
+    wxBkModeChanger(HDC hdc, int mode)
+        : m_hdc(hdc)
+    {
+        Change(mode);
+    }
+
+    ~wxBkModeChanger()
+    {
+        if ( m_oldMode )
+            ::SetBkMode(m_hdc, m_oldMode);
+    }
+
+protected:
+    // this ctor doesn't change mode immediately, call Change() later to do it
+    // only if needed
+    wxBkModeChanger(HDC hdc) : m_hdc(hdc) { m_oldMode = 0; }
+
+    void Change(int mode)
+    {
+        m_oldMode = ::SetBkMode(m_hdc, mode == wxBRUSHSTYLE_TRANSPARENT
+                                        ? TRANSPARENT
+                                        : OPAQUE);
+        if ( !m_oldMode )
+        {
+            wxLogLastError(_T("SetBkMode"));
+        }
+    }
+
+private:
+    const HDC m_hdc;
+    int m_oldMode;
+
+    DECLARE_NO_COPY_CLASS(wxBkModeChanger)
+};
+
 // instead of duplicating the same code which sets and then restores text
 // colours in each wxDC method working with wxSTIPPLE_MASK_OPAQUE brushes,
 // encapsulate this in a small helper class
 
-// wxColourChanger: changes the text colours in the ctor if required and
+// wxBrushAttrsSetter: changes the text colours in the ctor if required and
 //                  restores them in the dtor
-class wxColourChanger
+class wxBrushAttrsSetter : private wxBkModeChanger,
+                           private wxTextColoursChanger
 {
 public:
-    wxColourChanger(wxDC& dc);
-   ~wxColourChanger();
+    wxBrushAttrsSetter(wxMSWDCImpl& dc);
 
 private:
-    wxDC& m_dc;
-
-    COLORREF m_colFgOld, m_colBgOld;
-
-    bool m_changed;
-
-    DECLARE_NO_COPY_CLASS(wxColourChanger)
+    DECLARE_NO_COPY_CLASS(wxBrushAttrsSetter)
 };
 
 // this class saves the old stretch blit mode during its life time
@@ -205,6 +309,8 @@ private:
     DECLARE_NO_COPY_CLASS(StretchBltModeChanger)
 };
 
+#if wxUSE_DYNLIB_CLASS
+
 // helper class to cache dynamically loaded libraries and not attempt reloading
 // them if it fails
 class wxOnceOnlyDLLLoader
@@ -236,77 +342,85 @@ public:
         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;
 };
 
-static wxOnceOnlyDLLLoader wxGDI32DLL(_T("gdi32"));
 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
+
 // ===========================================================================
 // implementation
 // ===========================================================================
 
 // ----------------------------------------------------------------------------
-// wxColourChanger
+// wxBrushAttrsSetter
 // ----------------------------------------------------------------------------
 
-wxColourChanger::wxColourChanger(wxDC& dc) : m_dc(dc)
+wxBrushAttrsSetter::wxBrushAttrsSetter(wxMSWDCImpl& dc)
+                  : wxBkModeChanger(GetHdcOf(dc)),
+                    wxTextColoursChanger(GetHdcOf(dc))
 {
     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);
-        m_colBgOld = ::GetBkColor(hdc);
-
         // 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() )
-        {
-            ::SetBkColor(hdc, colFg.GetPixel());
-        }
+        wxTextColoursChanger::Change(dc.GetTextBackground(),
+                                     dc.GetTextForeground());
 
-        const wxColour& colBg = dc.GetTextBackground();
-        if ( colBg.Ok() )
-        {
-            ::SetTextColor(hdc, colBg.GetPixel());
-        }
-
-        SetBkMode(hdc,
-                  dc.GetBackgroundMode() == wxTRANSPARENT ? TRANSPARENT
-                                                          : OPAQUE);
-
-        // flag which telsl us to undo changes in the dtor
-        m_changed = true;
-    }
-    else
-    {
-        // nothing done, nothing to undo
-        m_changed = false;
+        wxBkModeChanger::Change(dc.GetBackgroundMode());
     }
 }
 
-wxColourChanger::~wxColourChanger()
-{
-    if ( m_changed )
-    {
-        // restore the colours we changed
-        HDC hdc = GetHdcOf(m_dc);
+// ----------------------------------------------------------------------------
+// wxDC MSW-specific methods
+// ----------------------------------------------------------------------------
 
-        ::SetBkMode(hdc, TRANSPARENT);
-        ::SetTextColor(hdc, m_colFgOld);
-        ::SetBkColor(hdc, m_colBgOld);
-    }
+WXHDC wxDC::GetHDC() const
+{
+    wxMSWDCImpl * const impl = wxDynamicCast(GetImpl(), wxMSWDCImpl);
+    return impl ? impl->GetHDC() : 0;
 }
 
 // ---------------------------------------------------------------------------
-// wxDC
+// wxMSWDCImpl
 // ---------------------------------------------------------------------------
 
-wxDC::~wxDC()
+wxMSWDCImpl::wxMSWDCImpl( wxDC *owner, WXHDC hDC ) :
+    wxDCImpl( owner )
+{
+    Init();
+    m_hDC = hDC;
+}
+
+wxMSWDCImpl::~wxMSWDCImpl()
 {
     if ( m_hDC != 0 )
     {
@@ -320,9 +434,9 @@ wxDC::~wxDC()
         }
         else // we don't own our HDC
         {
-            if (m_canvas)
+            if (m_window)
             {
-                ::ReleaseDC(GetHwndOf(m_canvas), GetHdc());
+                ::ReleaseDC(GetHwndOf(m_window), GetHdc());
             }
             else
             {
@@ -336,7 +450,7 @@ wxDC::~wxDC()
 // 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)
     {
@@ -344,7 +458,7 @@ void wxDC::SelectOldObjects(WXHDC dc)
         {
             ::SelectObject((HDC) dc, (HBITMAP) m_oldBitmap);
 #ifdef __WXDEBUG__
-            if (m_selectedBitmap.Ok())
+            if (m_selectedBitmap.IsOk())
             {
                 m_selectedBitmap.SetSelectedInto(NULL);
             }
@@ -390,7 +504,7 @@ void wxDC::SelectOldObjects(WXHDC dc)
 // clipping
 // ---------------------------------------------------------------------------
 
-void wxDC::UpdateClipBox()
+void wxMSWDCImpl::UpdateClipBox()
 {
     WXMICROWIN_CHECK_HDC
 
@@ -404,25 +518,25 @@ void wxDC::UpdateClipBox()
 }
 
 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 )
     {
-        wxDC *self = wxConstCast(this, wxDC);
+        wxMSWDCImpl *self = wxConstCast(this, wxMSWDCImpl);
         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()
-void wxDC::SetClippingHrgn(WXHRGN hrgn)
+// common part of DoSetClippingRegion() and DoSetDeviceClippingRegion()
+void wxMSWDCImpl::SetClippingHrgn(WXHRGN hrgn)
 {
     wxCHECK_RET( hrgn, wxT("invalid clipping region") );
 
@@ -467,7 +581,7 @@ void wxDC::SetClippingHrgn(WXHRGN hrgn)
     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
@@ -489,12 +603,12 @@ void wxDC::DoSetClippingRegion(wxCoord x, wxCoord y, wxCoord w, wxCoord h)
     }
 }
 
-void wxDC::DoSetClippingRegionAsRegion(const wxRegion& region)
+void wxMSWDCImpl::DoSetDeviceClippingRegion(const wxRegion& region)
 {
     SetClippingHrgn(region.GetHRGN());
 }
 
-void wxDC::DestroyClippingRegion()
+void wxMSWDCImpl::DestroyClippingRegion()
 {
     WXMICROWIN_CHECK_HDC
 
@@ -518,19 +632,19 @@ void wxDC::DestroyClippingRegion()
 #endif
     }
 
-    wxDCBase::DestroyClippingRegion();
+    wxDCImpl::DestroyClippingRegion();
 }
 
 // ---------------------------------------------------------------------------
 // query capabilities
 // ---------------------------------------------------------------------------
 
-bool wxDC::CanDrawBitmap() const
+bool wxMSWDCImpl::CanDrawBitmap() const
 {
     return true;
 }
 
-bool wxDC::CanGetTextExtent() const
+bool wxMSWDCImpl::CanGetTextExtent() const
 {
 #ifdef __WXMICROWIN__
     // TODO Extend MicroWindows' GetDeviceCaps function
@@ -543,7 +657,7 @@ bool wxDC::CanGetTextExtent() const
 #endif
 }
 
-int wxDC::GetDepth() const
+int wxMSWDCImpl::GetDepth() const
 {
     WXMICROWIN_CHECK_HDC_RET(16)
 
@@ -554,21 +668,21 @@ int wxDC::GetDepth() const
 // drawing
 // ---------------------------------------------------------------------------
 
-void wxDC::Clear()
+void wxMSWDCImpl::Clear()
 {
     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.
-        // 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;
@@ -585,20 +699,10 @@ void wxDC::Clear()
     ::FillRect(GetHdc(), &rect, brush);
     ::DeleteObject(brush);
 
-#ifndef __WXWINCE__
-    int width = DeviceToLogicalXRel(VIEWPORT_EXTENT)*m_signX,
-        height = DeviceToLogicalYRel(VIEWPORT_EXTENT)*m_signY;
-
-    ::SetMapMode(GetHdc(), MM_ANISOTROPIC);
-
-    ::SetViewportExtEx(GetHdc(), VIEWPORT_EXTENT, VIEWPORT_EXTENT, NULL);
-    ::SetWindowExtEx(GetHdc(), width, height, NULL);
-    ::SetViewportOrgEx(GetHdc(), (int)m_deviceOriginX, (int)m_deviceOriginY, NULL);
-    ::SetWindowOrgEx(GetHdc(), (int)m_logicalOriginX, (int)m_logicalOriginY, NULL);
-#endif
+    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))
@@ -635,11 +739,11 @@ bool wxDC::DoFloodFill(wxCoord WXUNUSED_IN_WINCE(x),
 #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)
 
-    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));
@@ -649,7 +753,7 @@ bool wxDC::DoGetPixel(wxCoord x, wxCoord y, wxColour *col) const
     return true;
 }
 
-void wxDC::DoCrossHair(wxCoord x, wxCoord y)
+void wxMSWDCImpl::DoCrossHair(wxCoord x, wxCoord y)
 {
     WXMICROWIN_CHECK_HDC
 
@@ -665,7 +769,7 @@ void wxDC::DoCrossHair(wxCoord x, wxCoord y)
     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
 
@@ -677,7 +781,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)
-void wxDC::DoDrawArc(wxCoord x1, wxCoord y1,
+void wxMSWDCImpl::DoDrawArc(wxCoord x1, wxCoord y1,
                      wxCoord x2, wxCoord y2,
                      wxCoord xc, wxCoord yc)
 {
@@ -692,7 +796,7 @@ void wxDC::DoDrawArc(wxCoord x1, wxCoord y1,
 
     WXMICROWIN_CHECK_HDC
 
-    wxColourChanger cc(*this); // needed for wxSTIPPLE_MASK_OPAQUE handling
+    wxBrushAttrsSetter cc(*this); // needed for wxSTIPPLE_MASK_OPAQUE handling
 
     double dx = xc - x1;
     double dy = yc - y1;
@@ -702,7 +806,7 @@ void wxDC::DoDrawArc(wxCoord x1, wxCoord y1,
     // 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;
     }
 
@@ -719,7 +823,7 @@ void wxDC::DoDrawArc(wxCoord x1, wxCoord y1,
     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).
@@ -738,7 +842,7 @@ void wxDC::DoDrawArc(wxCoord x1, wxCoord y1,
 #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()
@@ -755,7 +859,7 @@ void wxDC::DoDrawCheckMark(wxCoord x1, wxCoord y1,
     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
@@ -765,12 +869,12 @@ void wxDC::DoDrawCheckMark(wxCoord x1, wxCoord y1,
 #endif // Microwin/Normal
 }
 
-void wxDC::DoDrawPoint(wxCoord x, wxCoord y)
+void wxMSWDCImpl::DoDrawPoint(wxCoord x, wxCoord y)
 {
     WXMICROWIN_CHECK_HDC
 
     COLORREF color = 0x00ffffff;
-    if (m_pen.Ok())
+    if (m_pen.IsOk())
     {
         color = m_pen.GetColour().GetPixel();
     }
@@ -780,7 +884,7 @@ void wxDC::DoDrawPoint(wxCoord x, wxCoord y)
     CalcBoundingBox(x, y);
 }
 
-void wxDC::DoDrawPolygon(int n,
+void wxMSWDCImpl::DoDrawPolygon(int n,
                          wxPoint points[],
                          wxCoord xoffset,
                          wxCoord yoffset,
@@ -788,7 +892,7 @@ void wxDC::DoDrawPolygon(int n,
 {
     WXMICROWIN_CHECK_HDC
 
-    wxColourChanger cc(*this); // needed for wxSTIPPLE_MASK_OPAQUE handling
+    wxBrushAttrsSetter cc(*this); // needed for wxSTIPPLE_MASK_OPAQUE handling
 
     // Do things less efficiently if we have offsets
     if (xoffset != 0 || yoffset != 0)
@@ -828,7 +932,7 @@ void wxDC::DoDrawPolygon(int n,
 }
 
 void
-wxDC::DoDrawPolyPolygon(int n,
+wxMSWDCImpl::DoDrawPolyPolygon(int n,
                         int count[],
                         wxPoint points[],
                         wxCoord xoffset,
@@ -836,11 +940,11 @@ wxDC::DoDrawPolyPolygon(int n,
                         int fillStyle)
 {
 #ifdef __WXWINCE__
-    wxDCBase::DoDrawPolyPolygon(n, count, points, xoffset, yoffset, fillStyle);
+    wxDCImpl::DoDrawPolyPolygon(n, count, points, xoffset, yoffset, fillStyle);
 #else
     WXMICROWIN_CHECK_HDC
 
-    wxColourChanger cc(*this); // needed for wxSTIPPLE_MASK_OPAQUE handling
+    wxBrushAttrsSetter cc(*this); // needed for wxSTIPPLE_MASK_OPAQUE handling
     int i, cnt;
     for (i = cnt = 0; i < n; i++)
         cnt += count[i];
@@ -882,7 +986,7 @@ wxDC::DoDrawPolyPolygon(int n,
   // __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
 
@@ -911,53 +1015,40 @@ 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
 
-    wxColourChanger cc(*this); // needed for wxSTIPPLE_MASK_OPAQUE handling
+    wxBrushAttrsSetter cc(*this); // needed for wxSTIPPLE_MASK_OPAQUE handling
 
     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__
-            x2++;
-            y2++;
-#endif
-        }
-
-        (void)Rectangle(GetHdc(), XLOG2DEV(x), YLOG2DEV(y), XLOG2DEV(x2), YLOG2DEV(y2));
+    if ( m_pen.IsOk() && m_pen.GetStyle() == wxPENSTYLE_TRANSPARENT )
+    {
+        x2dev++;
+        y2dev++;
     }
+#endif // !__WXWINCE__
 
+    (void)Rectangle(GetHdc(), XLOG2DEV(x), YLOG2DEV(y), x2dev, y2dev);
 
     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
 
-    wxColourChanger cc(*this); // needed for wxSTIPPLE_MASK_OPAQUE handling
+    wxBrushAttrsSetter cc(*this); // needed for wxSTIPPLE_MASK_OPAQUE handling
 
     // Now, a negative radius value is interpreted to mean
     // 'the proportion of the smallest X or Y dimension'
@@ -974,7 +1065,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
-    if ( m_pen.GetStyle() == wxTRANSPARENT )
+    if ( m_pen.GetStyle() == wxPENSTYLE_TRANSPARENT )
     {
         x2++;
         y2++;
@@ -987,28 +1078,29 @@ void wxDC::DoDrawRoundedRectangle(wxCoord x, wxCoord y, wxCoord width, wxCoord h
     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
 
-    wxColourChanger cc(*this); // needed for wxSTIPPLE_MASK_OPAQUE handling
+    wxBrushAttrsSetter cc(*this); // needed for wxSTIPPLE_MASK_OPAQUE handling
 
-    wxCoord x2 = (x+width);
-    wxCoord y2 = (y+height);
+    // +1 below makes the ellipse more similar to other platforms.
+    // In particular, DoDrawEllipse(x,y,1,1) should draw one point.
+    wxCoord x2 = x + width + 1;
+    wxCoord y2 = y + height + 1;
 
-    (void)Ellipse(GetHdc(), XLOG2DEV(x), YLOG2DEV(y), XLOG2DEV(x2), YLOG2DEV(y2));
+    // Problem: Windows GDI Ellipse() with x2-x == y2-y == 3 and transparent
+    // pen doesn't draw anything. Should we provide a workaround?
+
+    ::Ellipse(GetHdc(), XLOG2DEV(x), YLOG2DEV(y), XLOG2DEV(x2), YLOG2DEV(y2));
 
     CalcBoundingBox(x, y);
     CalcBoundingBox(x2, y2);
 }
 
-#if wxUSE_SPLINES
-void wxDC::DoDrawSpline(wxList *points)
+#if wxUSE_SPLINES && !defined(__WXWINCE__)
+void wxMSWDCImpl::DoDrawSpline(const wxPointList *points)
 {
-#ifdef  __WXWINCE__
-    // WinCE does not support ::PolyBezier so use generic version
-    wxDCBase::DoDrawSpline(points);
-#else
     // quadratic b-spline to cubic bezier spline conversion
     //
     // quadratic spline with control points P0,P1,P2
@@ -1035,8 +1127,8 @@ void wxDC::DoDrawSpline(wxList *points)
     size_t bezier_pos = 0;
     wxCoord x1, y1, x2, y2, cx1, cy1, cx4, cy4;
 
-    wxList::compatibility_iterator node = points->GetFirst();
-    wxPoint *p = (wxPoint *)node->GetData();
+    wxPointList::compatibility_iterator node = points->GetFirst();
+    wxPoint *p = node->GetData();
     lppt[ bezier_pos ].x = x1 = p->x;
     lppt[ bezier_pos ].y = y1 = p->y;
     bezier_pos++;
@@ -1044,7 +1136,7 @@ void wxDC::DoDrawSpline(wxList *points)
     bezier_pos++;
 
     node = node->GetNext();
-    p = (wxPoint *)node->GetData();
+    p = node->GetData();
 
     x2 = p->x;
     y2 = p->y;
@@ -1097,12 +1189,11 @@ void wxDC::DoDrawSpline(wxList *points)
     ::PolyBezier( GetHdc(), lppt, bezier_pos );
 
     free(lppt);
-#endif
 }
-#endif
+#endif // wxUSE_SPLINES
 
 // 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 );
@@ -1110,7 +1201,7 @@ void wxDC::DoDrawEllipticArc(wxCoord x,wxCoord y,wxCoord w,wxCoord h,double sa,d
 
     WXMICROWIN_CHECK_HDC
 
-    wxColourChanger cc(*this); // needed for wxSTIPPLE_MASK_OPAQUE handling
+    wxBrushAttrsSetter cc(*this); // needed for wxSTIPPLE_MASK_OPAQUE handling
 
     wxCoord x2 = x + w;
     wxCoord y2 = y + h;
@@ -1128,6 +1219,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));
 
+    // 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));
@@ -1152,11 +1254,11 @@ void wxDC::DoDrawEllipticArc(wxCoord x,wxCoord y,wxCoord w,wxCoord h,double sa,d
 #endif
 }
 
-void wxDC::DoDrawIcon(const wxIcon& icon, wxCoord x, wxCoord y)
+void wxMSWDCImpl::DoDrawIcon(const wxIcon& icon, wxCoord x, wxCoord y)
 {
     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);
@@ -1168,11 +1270,11 @@ void wxDC::DoDrawIcon(const wxIcon& icon, wxCoord x, wxCoord y)
     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
 
-    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();
@@ -1247,13 +1349,13 @@ void wxDC::DoDrawBitmap( const wxBitmap &bmp, wxCoord x, wxCoord y, bool useMask
         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);
 
-            Blit(x, y, width, height, &memDC, 0, 0, wxCOPY, useMask);
+            GetOwner()->Blit(x, y, width, height, &memDC, 0, 0, wxCOPY, useMask);
 
             memDC.SelectObject(wxNullBitmap);
         }
@@ -1266,16 +1368,7 @@ void wxDC::DoDrawBitmap( const wxBitmap &bmp, wxCoord x, wxCoord y, bool useMask
 
         wxASSERT_MSG( hbitmap, wxT("bitmap is ok but HBITMAP is NULL?") );
 
-        COLORREF old_textground = ::GetTextColor(GetHdc());
-        COLORREF old_background = ::GetBkColor(GetHdc());
-        if (m_textForegroundColour.Ok())
-        {
-            ::SetTextColor(GetHdc(), m_textForegroundColour.GetPixel() );
-        }
-        if (m_textBackgroundColour.Ok())
-        {
-            ::SetBkColor(GetHdc(), m_textBackgroundColour.GetPixel() );
-        }
+        wxTextColoursChanger textCol(GetHdc(), *this);
 
 #if wxUSE_PALETTE
         wxPalette *pal = bmp.GetPalette();
@@ -1296,13 +1389,10 @@ void wxDC::DoDrawBitmap( const wxBitmap &bmp, wxCoord x, wxCoord y, bool useMask
 
         ::SelectObject( memdc, hOldBitmap );
         ::DeleteDC( memdc );
-
-        ::SetTextColor(GetHdc(), old_textground);
-        ::SetBkColor(GetHdc(), old_background);
     }
 }
 
-void wxDC::DoDrawText(const wxString& text, wxCoord x, wxCoord y)
+void wxMSWDCImpl::DoDrawText(const wxString& text, wxCoord x, wxCoord y)
 {
     WXMICROWIN_CHECK_HDC
 
@@ -1312,51 +1402,27 @@ void wxDC::DoDrawText(const wxString& text, wxCoord x, wxCoord y)
     CalcBoundingBox(x, y);
 
     wxCoord w, h;
-    GetTextExtent(text, &w, &h);
+    GetOwner()->GetTextExtent(text, &w, &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
-    if ( m_textForegroundColour.Ok() )
-        SetTextColor(GetHdc(), m_textForegroundColour.GetPixel());
+    wxTextColoursChanger textCol(GetHdc(), *this);
 
-    DWORD old_background = 0;
-    if ( m_textBackgroundColour.Ok() )
-    {
-        old_background = SetBkColor(GetHdc(), m_textBackgroundColour.GetPixel() );
-    }
+    wxBkModeChanger bkMode(GetHdc(), m_backgroundMode);
 
-    SetBkMode(GetHdc(), m_backgroundMode == wxTRANSPARENT ? TRANSPARENT
-                                                          : OPAQUE);
-
-#ifdef __WXWINCE__
     if ( ::ExtTextOut(GetHdc(), XLOG2DEV(x), YLOG2DEV(y), 0, NULL,
                    text.c_str(), text.length(), NULL) == 0 )
     {
         wxLogLastError(wxT("TextOut"));
     }
-#else
-    if ( ::TextOut(GetHdc(), XLOG2DEV(x), YLOG2DEV(y),
-                   text.c_str(), text.length()) == 0 )
-    {
-        wxLogLastError(wxT("TextOut"));
-    }
-#endif
-
-    // 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() )
-        (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)
 {
@@ -1366,7 +1432,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)
-    if ( (angle == 0.0) && m_font.Ok() )
+    if ( (angle == 0.0) && m_font.IsOk() )
     {
         DoDrawText(text, x, y);
     }
@@ -1376,7 +1442,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
-        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 )
@@ -1408,7 +1474,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;
-        GetTextExtent(text, &w, &h);
+        GetOwner()->GetTextExtent(text, &w, &h);
 
         double rad = DegToRad(angle);
 
@@ -1431,7 +1497,7 @@ void wxDC::DoDrawRotatedText(const wxString& text,
 
 #if wxUSE_PALETTE
 
-void wxDC::DoSelectPalette(bool realize)
+void wxMSWDCImpl::DoSelectPalette(bool realize)
 {
     WXMICROWIN_CHECK_HDC
 
@@ -1443,7 +1509,7 @@ void wxDC::DoSelectPalette(bool realize)
         m_oldPalette = 0;
     }
 
-    if ( m_palette.Ok() )
+    if ( m_palette.IsOk() )
     {
         HPALETTE oldPal = ::SelectPalette(GetHdc(),
                                           GetHpaletteOf(m_palette),
@@ -1456,22 +1522,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);
     }
 }
 
-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
-        wxWindow *win = m_canvas->GetAncestorWithCustomPalette();
+        wxWindow *win = m_window->GetAncestorWithCustomPalette();
 
         m_hasCustomPalette = win && win->HasCustomPalette();
         if ( m_hasCustomPalette )
@@ -1489,14 +1555,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>
 
-void wxDC::SetFont(const wxFont& font)
+void wxMSWDCImpl::SetFont(const wxFont& font)
 {
     WXMICROWIN_CHECK_HDC
 
     if ( font == m_font )
         return;
 
-    if ( font.Ok() )
+    if ( font.IsOk() )
     {
         HGDIOBJ hfont = ::SelectObject(GetHdc(), GetHfontOf(font));
         if ( hfont == HGDI_ERROR )
@@ -1527,14 +1593,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;
 
-    if ( pen.Ok() )
+    if ( pen.IsOk() )
     {
         HGDIOBJ hpen = ::SelectObject(GetHdc(), GetHpenOf(pen));
         if ( hpen == HGDI_ERROR )
@@ -1565,19 +1631,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;
 
-    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();
-        if ( stipple && stipple->Ok() )
+        if ( stipple && stipple->IsOk() )
         {
             if ( !::SetBrushOrgEx
                     (
@@ -1620,19 +1686,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;
 
-    if ( m_backgroundBrush.Ok() )
+    if ( m_backgroundBrush.IsOk() )
     {
         (void)SetBkColor(GetHdc(), m_backgroundBrush.GetColour().GetPixel());
     }
 }
 
-void wxDC::SetBackgroundMode(int mode)
+void wxMSWDCImpl::SetBackgroundMode(int mode)
 {
     WXMICROWIN_CHECK_HDC
 
@@ -1642,7 +1708,7 @@ void wxDC::SetBackgroundMode(int mode)
     // and m_backgroundMode is used there
 }
 
-void wxDC::SetLogicalFunction(int function)
+void wxMSWDCImpl::SetLogicalFunction(int function)
 {
     WXMICROWIN_CHECK_HDC
 
@@ -1651,7 +1717,7 @@ void wxDC::SetLogicalFunction(int function)
     SetRop(m_hDC);
 }
 
-void wxDC::SetRop(WXHDC dc)
+void wxMSWDCImpl::SetRop(WXHDC dc)
 {
     if ( !dc || m_logicalFunction < 0 )
         return;
@@ -1685,21 +1751,21 @@ void wxDC::SetRop(WXHDC dc)
     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;
 }
 
-void wxDC::EndDoc()
+void wxMSWDCImpl::EndDoc()
 {
 }
 
-void wxDC::StartPage()
+void wxMSWDCImpl::StartPage()
 {
 }
 
-void wxDC::EndPage()
+void wxMSWDCImpl::EndPage()
 {
 }
 
@@ -1707,7 +1773,7 @@ void wxDC::EndPage()
 // text metrics
 // ---------------------------------------------------------------------------
 
-wxCoord wxDC::GetCharHeight() const
+wxCoord wxMSWDCImpl::GetCharHeight() const
 {
     WXMICROWIN_CHECK_HDC_RET(0)
 
@@ -1718,7 +1784,7 @@ wxCoord wxDC::GetCharHeight() const
     return lpTextMetric.tmHeight;
 }
 
-wxCoord wxDC::GetCharWidth() const
+wxCoord wxMSWDCImpl::GetCharWidth() const
 {
     WXMICROWIN_CHECK_HDC_RET(0)
 
@@ -1729,7 +1795,7 @@ wxCoord wxDC::GetCharWidth() const
     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
 {
@@ -1747,7 +1813,7 @@ void wxDC::DoGetTextExtent(const wxString& string, wxCoord *x, wxCoord *y,
     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));
     }
@@ -1758,7 +1824,7 @@ void wxDC::DoGetTextExtent(const wxString& string, wxCoord *x, wxCoord *y,
 
     SIZE sizeRect;
     const size_t len = string.length();
-    if ( !::GetTextExtentPoint32(GetHdc(), string, len, &sizeRect) )
+    if ( !::GetTextExtentPoint32(GetHdc(), string.wx_str(), len, &sizeRect) )
     {
         wxLogLastError(_T("GetTextExtentPoint32()"));
     }
@@ -1813,7 +1879,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.
 
-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;
@@ -1851,10 +1917,26 @@ bool wxDC::DoGetPartialTextExtents(const wxString& text, wxArrayInt& widths) con
     return true;
 }
 
+void wxMSWDCImpl::RealizeScaleAndOrigin()
+{
+    // although it may seem wasteful to always use MM_ANISOTROPIC here instead
+    // of using MM_TEXT if there is no scaling, benchmarking doesn't detect any
+    // noticeable difference between these mapping modes
+#ifndef __WXWINCE__
+    ::SetMapMode(GetHdc(), MM_ANISOTROPIC);
 
+    int width = DeviceToLogicalXRel(VIEWPORT_EXTENT)*m_signX,
+        height = DeviceToLogicalYRel(VIEWPORT_EXTENT)*m_signY;
 
+    ::SetViewportExtEx(GetHdc(), VIEWPORT_EXTENT, VIEWPORT_EXTENT, NULL);
+    ::SetWindowExtEx(GetHdc(), width, height, NULL);
+
+    ::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
 
@@ -1908,150 +1990,76 @@ void wxDC::SetMapMode(int mode)
         }
     }
 
-    // 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
-    //     MM_ISOTROPIC (TODO!)
-#ifndef __WXWINCE__
-    ::SetMapMode(GetHdc(), MM_ANISOTROPIC);
-
-    int width = DeviceToLogicalXRel(VIEWPORT_EXTENT)*m_signX,
-        height = DeviceToLogicalYRel(VIEWPORT_EXTENT)*m_signY;
-
-    ::SetViewportExtEx(GetHdc(), VIEWPORT_EXTENT, VIEWPORT_EXTENT, NULL);
-    ::SetWindowExtEx(GetHdc(), width, height, NULL);
+    ComputeScaleAndOrigin();
 
-    ::SetViewportOrgEx(GetHdc(), m_deviceOriginX, m_deviceOriginY, NULL);
-    ::SetWindowOrgEx(GetHdc(), m_logicalOriginX, m_logicalOriginY, NULL);
-#endif
+    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;
 
-    m_userScaleX = x;
-    m_userScaleY = y;
+    wxDCImpl::SetUserScale(x,y);
 
-    this->SetMapMode(m_mappingMode);
+    RealizeScaleAndOrigin();
 }
 
-void wxDC::SetAxisOrientation(bool WXUNUSED_IN_WINCE(xLeftRight),
-                              bool WXUNUSED_IN_WINCE(yBottomUp))
+void wxMSWDCImpl::SetAxisOrientation(bool xLeftRight,
+                              bool yBottomUp)
 {
     WXMICROWIN_CHECK_HDC
 
-#ifndef __WXWINCE__
     int signX = xLeftRight ? 1 : -1,
         signY = yBottomUp ? -1 : 1;
 
-    if ( signX != m_signX || signY != m_signY )
-    {
-        m_signX = signX;
-        m_signY = signY;
+    if (signX == m_signX && signY == m_signY)
+        return;
 
-        SetMapMode(m_mappingMode);
-    }
-#endif
+    wxDCImpl::SetAxisOrientation( xLeftRight, yBottomUp );
+
+    RealizeScaleAndOrigin();
 }
 
-void wxDC::SetSystemScale(double x, double y)
+void wxMSWDCImpl::SetLogicalOrigin(wxCoord x, wxCoord y)
 {
     WXMICROWIN_CHECK_HDC
 
-    if ( x == m_scaleX && y == m_scaleY )
+    if ( x == m_logicalOriginX && y == m_logicalOriginY )
         return;
 
-    m_scaleX = x;
-    m_scaleY = y;
+    wxDCImpl::SetLogicalOrigin( x, y );
 
-#ifndef __WXWINCE__
-    SetMapMode(m_mappingMode);
-#endif
+    RealizeScaleAndOrigin();
 }
 
-void wxDC::SetLogicalOrigin(wxCoord x, wxCoord y)
+// For use by wxWidgets only, unless custom units are required.
+void wxMSWDCImpl::SetLogicalScale(double x, double y)
 {
     WXMICROWIN_CHECK_HDC
 
-    if ( x == m_logicalOriginX && y == m_logicalOriginY )
-        return;
-
-    m_logicalOriginX = x;
-    m_logicalOriginY = y;
-
-#ifndef __WXWINCE__
-    ::SetWindowOrgEx(GetHdc(), (int)m_logicalOriginX, (int)m_logicalOriginY, NULL);
-#endif
+    wxDCImpl::SetLogicalScale(x,y);
 }
 
-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;
 
-    m_deviceOriginX = x;
-    m_deviceOriginY = y;
+    wxDCImpl::SetDeviceOrigin( x, y );
 
     ::SetViewportOrgEx(GetHdc(), (int)m_deviceOriginX, (int)m_deviceOriginY, NULL);
 }
 
-// ---------------------------------------------------------------------------
-// coordinates transformations
-// ---------------------------------------------------------------------------
-
-wxCoord wxDC::DeviceToLogicalX(wxCoord x) const
-{
-    return DeviceToLogicalXRel(x - m_deviceOriginX)*m_signX + m_logicalOriginX;
-}
-
-wxCoord wxDC::DeviceToLogicalXRel(wxCoord x) const
-{
-    // axis orientation is not taken into account for conversion of a distance
-    return (wxCoord)(x / (m_logicalScaleX*m_userScaleX*m_scaleX));
-}
-
-wxCoord wxDC::DeviceToLogicalY(wxCoord y) const
-{
-    return DeviceToLogicalYRel(y - m_deviceOriginY)*m_signY + m_logicalOriginY;
-}
-
-wxCoord wxDC::DeviceToLogicalYRel(wxCoord y) const
-{
-    // axis orientation is not taken into account for conversion of a distance
-    return (wxCoord)( y / (m_logicalScaleY*m_userScaleY*m_scaleY));
-}
-
-wxCoord wxDC::LogicalToDeviceX(wxCoord x) const
-{
-    return LogicalToDeviceXRel(x - m_logicalOriginX)*m_signX + m_deviceOriginX;
-}
-
-wxCoord wxDC::LogicalToDeviceXRel(wxCoord x) const
-{
-    // axis orientation is not taken into account for conversion of a distance
-    return (wxCoord) (x*m_logicalScaleX*m_userScaleX*m_scaleX);
-}
-
-wxCoord wxDC::LogicalToDeviceY(wxCoord y) const
-{
-    return LogicalToDeviceYRel(y - m_logicalOriginY)*m_signY + m_deviceOriginY;
-}
-
-wxCoord wxDC::LogicalToDeviceYRel(wxCoord y) const
-{
-    // axis orientation is not taken into account for conversion of a distance
-    return (wxCoord) (y*m_logicalScaleY*m_userScaleY*m_scaleY);
-}
-
 // ---------------------------------------------------------------------------
 // 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,
@@ -2061,7 +2069,7 @@ bool wxDC::DoBlit(wxCoord dstX, wxCoord dstY,
     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,
@@ -2069,18 +2077,27 @@ bool wxDC::DoStretchBlit(wxCoord xdest, wxCoord ydest,
                          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)
 
+    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
-    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,
-                      xsrc, ysrc, srcWidth, srcHeight, GetHdcOf(*source), bmpSrc) )
+                      xsrc, ysrc, srcWidth, srcHeight, hdcSrc, bmpSrc) )
             return true;
     }
 
@@ -2089,7 +2106,7 @@ bool wxDC::DoStretchBlit(wxCoord xdest, wxCoord ydest,
     {
         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
@@ -2102,16 +2119,7 @@ bool wxDC::DoStretchBlit(wxCoord xdest, wxCoord ydest,
         xsrcMask = xsrc; ysrcMask = ysrc;
     }
 
-    COLORREF old_textground = ::GetTextColor(GetHdc());
-    COLORREF old_background = ::GetBkColor(GetHdc());
-    if (m_textForegroundColour.Ok())
-    {
-        ::SetTextColor(GetHdc(), m_textForegroundColour.GetPixel() );
-    }
-    if (m_textBackgroundColour.Ok())
-    {
-        ::SetBkColor(GetHdc(), m_textBackgroundColour.GetPixel() );
-    }
+    wxTextColoursChanger textCol(GetHdc(), *this);
 
     DWORD dwRop;
     switch (rop)
@@ -2160,7 +2168,7 @@ bool wxDC::DoStretchBlit(wxCoord xdest, wxCoord ydest,
                             (
                             GetHdc(),
                             xdest, ydest, dstWidth, dstHeight,
-                            GetHdcOf(*source),
+                            hdcSrc,
                             xsrc, ysrc,
                             (HBITMAP)mask->GetMaskBitmap(),
                             xsrcMask, ysrcMask,
@@ -2179,7 +2187,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
-            wxDCCacheEntry* dcCacheEntry1 = FindDCInCache(NULL, source->GetHDC());
+            wxDCCacheEntry* dcCacheEntry1 = FindDCInCache(NULL, hdcSrc);
             dc_mask = (HDC) dcCacheEntry1->m_dc;
 
             wxDCCacheEntry* dcCacheEntry2 = FindDCInCache(dcCacheEntry1, GetHDC());
@@ -2191,7 +2199,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
-            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
@@ -2199,7 +2207,7 @@ bool wxDC::DoStretchBlit(wxCoord xdest, wxCoord ydest,
             HGDIOBJ hOldBufferBitmap = ::SelectObject(dc_buffer, buffer_bmap);
 
             // copy dest to buffer
-            if ( !::BitBlt(dc_buffer, 0, 0, (int)dstWidth, (int)dstHeight,
+            if ( !::BitBlt(dc_buffer, 0, 0, dstWidth, dstHeight,
                            GetHdc(), xdest, ydest, SRCCOPY) )
             {
                 wxLogLastError(wxT("BitBlt"));
@@ -2210,35 +2218,35 @@ bool wxDC::DoStretchBlit(wxCoord xdest, wxCoord ydest,
 #endif
 
             // 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) )
+            if ( !::StretchBlt(dc_buffer, 0, 0, dstWidth, dstHeight,
+                               hdcSrc, xsrc, ysrc, srcWidth, srcHeight, dwRop) )
             {
                 wxLogLastError(wxT("StretchBlt"));
             }
 
-            // set masked area in buffer to BLACK (pixel value 0)
-            COLORREF prevBkCol = ::SetBkColor(GetHdc(), RGB(255, 255, 255));
-            COLORREF prevCol = ::SetTextColor(GetHdc(), RGB(0, 0, 0));
-            if ( !::StretchBlt(dc_buffer, 0, 0, (int)dstWidth, (int)dstHeight,
-                           dc_mask, xsrcMask, ysrcMask, srcWidth, srcHeight, SRCAND) )
+            // set masked area in buffer to BLACK
             {
-                wxLogLastError(wxT("StretchBlt"));
-            }
+                wxTextColoursChanger textCol2(GetHdc(), *wxBLACK, *wxWHITE);
+                if ( !::StretchBlt(dc_buffer, 0, 0, dstWidth, dstHeight,
+                                   dc_mask, xsrcMask, ysrcMask,
+                                   srcWidth, srcHeight, SRCAND) )
+                {
+                    wxLogLastError(wxT("StretchBlt"));
+                }
 
-            // set unmasked area in dest to BLACK
-            ::SetBkColor(GetHdc(), RGB(0, 0, 0));
-            ::SetTextColor(GetHdc(), RGB(255, 255, 255));
-            if ( !::StretchBlt(GetHdc(), xdest, ydest, (int)dstWidth, (int)dstHeight,
-                           dc_mask, xsrcMask, ysrcMask, srcWidth, srcHeight, SRCAND) )
-            {
-                wxLogLastError(wxT("StretchBlt"));
-            }
-            ::SetBkColor(GetHdc(), prevBkCol);   // restore colours to original values
-            ::SetTextColor(GetHdc(), prevCol);
+                // set unmasked area in dest to BLACK
+                ::SetBkColor(GetHdc(), RGB(0, 0, 0));
+                ::SetTextColor(GetHdc(), RGB(255, 255, 255));
+                if ( !::StretchBlt(GetHdc(), xdest, ydest, dstWidth, dstHeight,
+                                   dc_mask, xsrcMask, ysrcMask,
+                                   srcWidth, srcHeight, SRCAND) )
+                {
+                    wxLogLastError(wxT("StretchBlt"));
+                }
+            } // restore the original text and background colours
 
             // OR buffer to dest
-            success = ::BitBlt(GetHdc(), xdest, ydest,
-                               (int)dstWidth, (int)dstHeight,
+            success = ::BitBlt(GetHdc(), xdest, ydest, dstWidth, dstHeight,
                                dc_buffer, 0, 0, SRCPAINT) != 0;
             if ( !success )
             {
@@ -2266,7 +2274,7 @@ bool wxDC::DoStretchBlit(wxCoord xdest, wxCoord ydest,
         // 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);
@@ -2322,7 +2330,7 @@ bool wxDC::DoStretchBlit(wxCoord xdest, wxCoord ydest,
                     (
                         GetHdc(),
                         xdest, ydest, dstWidth, dstHeight,
-                        GetHdcOf(*source),
+                        hdcSrc,
                         xsrc, ysrc, srcWidth, srcHeight,
                         dwRop
                     ) )
@@ -2337,15 +2345,8 @@ bool wxDC::DoStretchBlit(wxCoord xdest, wxCoord ydest,
 
         if ( !success )
         {
-            if ( !::BitBlt
-                    (
-                        GetHdc(),
-                        xdest, ydest,
-                        (int)dstWidth, (int)dstHeight,
-                        GetHdcOf(*source),
-                        xsrc, ysrc,
-                        dwRop
-                    ) )
+            if ( !::BitBlt(GetHdc(), xdest, ydest, dstWidth, dstHeight,
+                           hdcSrc, xsrc, ysrc, dwRop) )
             {
                 wxLogLastError(_T("BitBlt"));
             }
@@ -2356,13 +2357,10 @@ bool wxDC::DoStretchBlit(wxCoord xdest, wxCoord ydest,
         }
     }
 
-    ::SetTextColor(GetHdc(), old_textground);
-    ::SetBkColor(GetHdc(), old_background);
-
     return success;
 }
 
-void wxDC::GetDeviceSize(int *width, int *height) const
+void wxMSWDCImpl::GetDeviceSize(int *width, int *height) const
 {
     WXMICROWIN_CHECK_HDC
 
@@ -2372,7 +2370,7 @@ void wxDC::GetDeviceSize(int *width, int *height) const
         *height = ::GetDeviceCaps(GetHdc(), VERTRES);
 }
 
-void wxDC::DoGetSizeMM(int *w, int *h) const
+void wxMSWDCImpl::DoGetSizeMM(int *w, int *h) const
 {
     WXMICROWIN_CHECK_HDC
 
@@ -2402,7 +2400,7 @@ void wxDC::DoGetSizeMM(int *w, int *h) const
     }
 }
 
-wxSize wxDC::GetPPI() const
+wxSize wxMSWDCImpl::GetPPI() const
 {
     WXMICROWIN_CHECK_HDC_RET(wxSize(0,0))
 
@@ -2412,15 +2410,6 @@ wxSize wxDC::GetPPI() const
     return wxSize(x, y);
 }
 
-// For use by wxWidgets only, unless custom units are required.
-void wxDC::SetLogicalScale(double x, double y)
-{
-    WXMICROWIN_CHECK_HDC
-
-    m_logicalScaleX = x;
-    m_logicalScaleY = y;
-}
-
 // ----------------------------------------------------------------------------
 // DC caching
 // ----------------------------------------------------------------------------
@@ -2433,8 +2422,8 @@ void wxDC::SetLogicalScale(double x, double y)
  * 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)
 {
@@ -2462,7 +2451,7 @@ wxDCCacheEntry::~wxDCCacheEntry()
         ::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();
@@ -2498,7 +2487,7 @@ wxDCCacheEntry* wxDC::FindBitmapInCache(WXHDC dc, int w, int h)
     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();
@@ -2527,17 +2516,17 @@ wxDCCacheEntry* wxDC::FindDCInCache(wxDCCacheEntry* notThis, WXHDC dc)
     return entry;
 }
 
-void wxDC::AddToBitmapCache(wxDCCacheEntry* entry)
+void wxMSWDCImpl::AddToBitmapCache(wxDCCacheEntry* entry)
 {
     sm_bitmapCache.Append(entry);
 }
 
-void wxDC::AddToDCCache(wxDCCacheEntry* entry)
+void wxMSWDCImpl::AddToDCCache(wxDCCacheEntry* entry)
 {
     sm_dcCache.Append(entry);
 }
 
-void wxDC::ClearCache()
+void wxMSWDCImpl::ClearCache()
 {
     WX_CLEAR_LIST(wxList, sm_dcCache);
     WX_CLEAR_LIST(wxList, sm_bitmapCache);
@@ -2548,7 +2537,7 @@ class wxDCModule : public wxModule
 {
 public:
     virtual bool OnInit() { return true; }
-    virtual void OnExit() { wxDC::ClearCache(); }
+    virtual void OnExit() { wxMSWDCImpl::ClearCache(); }
 
 private:
     DECLARE_DYNAMIC_CLASS(wxDCModule)
@@ -2564,12 +2553,12 @@ IMPLEMENT_DYNAMIC_CLASS(wxDCModule, wxModule)
 
 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)
 {
-    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?
@@ -2605,26 +2594,26 @@ static bool AlphaBlt(HDC hdcDst,
 
     // AlphaBlend() unavailable of failed: use our own (probably much slower)
     // implementation
-#ifdef wxHAVE_RAW_BITMAP
+#ifdef wxHAS_RAW_BITMAP
     wxAlphaBlend(hdcDst, x, y, dstWidth, dstHeight, srcX, srcY, srcWidth, srcHeight, bmp);
 
     return true;
-#else // !wxHAVE_RAW_BITMAP
+#else // !wxHAS_RAW_BITMAP
     // no wxAlphaBlend() neither, fall back to using simple BitBlt() (we lose
     // alpha but at least something will be shown like this)
     wxUnusedVar(bmp);
     return false;
-#endif // wxHAVE_RAW_BITMAP
+#endif // wxHAS_RAW_BITMAP/!wxHAS_RAW_BITMAP
 }
 
 
 // wxAlphaBlend: our fallback if ::AlphaBlend() is unavailable
-#ifdef wxHAVE_RAW_BITMAP
+#ifdef wxHAS_RAW_BITMAP
 
 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)
 {
@@ -2681,9 +2670,9 @@ wxAlphaBlend(HDC hdcDst, int xDst, int yDst,
     }
 }
 
-#endif // #ifdef wxHAVE_RAW_BITMAP
+#endif // wxHAS_RAW_BITMAP
 
-void wxDC::DoGradientFillLinear (const wxRect& rect,
+void wxMSWDCImpl::DoGradientFillLinear (const wxRect& rect,
                                  const wxColour& initialColour,
                                  const wxColour& destColour,
                                  wxDirection nDirection)
@@ -2744,19 +2733,21 @@ void wxDC::DoGradientFillLinear (const wxRect& rect,
     }
 #endif // wxUSE_DYNLIB_CLASS
 
-    wxDCBase::DoGradientFillLinear(rect, initialColour, destColour, nDirection);
+    wxDCImpl::DoGradientFillLinear(rect, initialColour, destColour, nDirection);
 }
 
+#if wxUSE_DYNLIB_CLASS
+
 static DWORD wxGetDCLayout(HDC hdc)
 {
     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());
 
@@ -2766,12 +2757,12 @@ wxLayoutDirection wxDC::GetLayoutDirection() const
     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
-        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 )
@@ -2787,5 +2778,19 @@ void wxDC::SetLayoutDirection(wxLayoutDirection dir)
     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
+wxLayoutDirection wxMSWDCImpl::GetLayoutDirection() const
+{
+    return wxLayout_Default;
+}
+
+void wxMSWDCImpl::SetLayoutDirection(wxLayoutDirection WXUNUSED(dir))
+{
+}
+
+#endif // wxUSE_DYNLIB_CLASS/!wxUSE_DYNLIB_CLASS