Renamed m_clientData member variable to avoid clash with variable with same

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

diff --git a/src/msw/dc.cpp b/src/msw/dc.cpp
index 25997d4c27ba59f81a8736e9239ae0a82aaa3db3..f22685ba9726e53ae9dffc683aaee7e4b377e776 100644 (file)
--- a/src/msw/dc.cpp
+++ b/src/msw/dc.cpp
@@ -1,127 +1,331 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        dc.cpp
-// Purpose:     wxDC class
+// Name:        src/msw/dc.cpp
+// Purpose:     wxDC class for MSW port

 // Author:      Julian Smart
 // Modified by:
 // Created:     01/02/97
 // RCS-ID:      $Id$
 // Author:      Julian Smart
 // Modified by:
 // Created:     01/02/97
 // RCS-ID:      $Id$

-// Copyright:   (c) Julian Smart and Markus Holzem
+// Copyright:   (c) Julian Smart

 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 

-#ifdef __GNUG__
-#pragma implementation "dc.h"
-#endif
+// ===========================================================================
+// declarations
+// ===========================================================================
+
+// ---------------------------------------------------------------------------
+// headers
+// ---------------------------------------------------------------------------

 
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 #ifdef __BORLANDC__
 
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 #ifdef __BORLANDC__

-#pragma hdrstop
+    #pragma hdrstop

 #endif
 
 #ifndef WX_PRECOMP
 #endif
 
 #ifndef WX_PRECOMP

-#include "wx/frame.h"
-#include "wx/dc.h"
-#include "wx/utils.h"
-#include "wx/dialog.h"
-#include "wx/app.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/bitmap.h"
+    #include "wx/dcmemory.h"
+    #include "wx/log.h"
+    #include "wx/icon.h"
+    #include "wx/dcprint.h"
+    #include "wx/module.h"

 #endif
 
 #endif
 

-#include "wx/dcprint.h"
-#include "wx/msw/private.h"
+#include "wx/sysopt.h"
+#include "wx/dynlib.h"
+
+#ifdef wxHAVE_RAW_BITMAP
+#include "wx/rawbmp.h"
+#endif

 
 #include <string.h>
 
 #include <string.h>

-#include <math.h>

 
 

-#if wxUSE_COMMON_DIALOGS
-#include <commdlg.h>
+#ifndef __WIN32__
+    #include <print.h>

 #endif
 
 #endif
 

-#ifndef __WIN32__
-#include <print.h>
+#ifndef AC_SRC_ALPHA
+    #define AC_SRC_ALPHA 1

 #endif
 
 #endif
 

-#ifdef DrawText
-#undef DrawText
+#ifndef LAYOUT_RTL
+    #define LAYOUT_RTL 1

 #endif
 
 #endif
 

-#ifdef GetCharWidth
-#undef GetCharWidth
+/* Quaternary raster codes */
+#ifndef MAKEROP4
+#define MAKEROP4(fore,back) (DWORD)((((back) << 8) & 0xFF000000) | (fore))

 #endif
 
 #endif
 

-#ifdef StartDoc
-#undef StartDoc
+// apparently with MicroWindows it is possible that HDC is 0 so we have to
+// check for this ourselves
+#ifdef __WXMICROWIN__
+    #define WXMICROWIN_CHECK_HDC if ( !GetHDC() ) return;
+    #define WXMICROWIN_CHECK_HDC_RET(x) if ( !GetHDC() ) return x;
+#else
+    #define WXMICROWIN_CHECK_HDC
+    #define WXMICROWIN_CHECK_HDC_RET(x)

 #endif
 
 #endif
 

-#if !USE_SHARED_LIBRARY
-IMPLEMENT_ABSTRACT_CLASS(wxDC, wxObject)
+IMPLEMENT_ABSTRACT_CLASS(wxDC, wxDCBase)
+
+// ---------------------------------------------------------------------------
+// constants
+// ---------------------------------------------------------------------------
+
+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
+
+// ----------------------------------------------------------------------------
+// macros for logical <-> device coords conversion
+// ----------------------------------------------------------------------------
+
+/*
+   We currently let Windows do all the translations itself so these macros are
+   not really needed (any more) but keep them to enhance readability of the
+   code by allowing to see where are the logical and where are the device
+   coordinates used.
+ */
+
+#ifdef __WXWINCE__
+    #define XLOG2DEV(x) ((x-m_logicalOriginX)*m_signX)
+    #define YLOG2DEV(y) ((y-m_logicalOriginY)*m_signY)
+    #define XDEV2LOG(x) ((x)*m_signX+m_logicalOriginX)
+    #define YDEV2LOG(y) ((y)*m_signY+m_logicalOriginY)
+#else
+    #define XLOG2DEV(x) (x)
+    #define YLOG2DEV(y) (y)
+    #define XDEV2LOG(x) (x)
+    #define YDEV2LOG(y) (y)

 #endif
 
 #endif
 

-// Declarations local to this file
+// ---------------------------------------------------------------------------
+// private functions
+// ---------------------------------------------------------------------------
+
+// convert degrees to radians
+static inline double DegToRad(double deg) { return (deg * M_PI) / 180.0; }

 
 

-#define YSCALE(y) (yorigin - (y))
+// call AlphaBlend() to blit contents of hdcSrc to hdcDst using alpha
+//
+// NB: bmpSrc is the bitmap selected in hdcSrc, it is not really needed
+//     to pass it to this function but as we already have it at the point
+//     of call anyhow we do
+//
+// return true if we could draw the bitmap in one way or the other, false
+// otherwise
+static bool AlphaBlt(HDC hdcDst,
+                     int x, int y, int w, int h,
+                     int srcX, int srcY, HDC hdcSrc,
+                     const wxBitmap& bmpSrc);

 
 

-// #define     wx_round(a)    (int)((a)+.5)
+#ifdef wxHAVE_RAW_BITMAP

 
 

-// Default constructor
-wxDC::wxDC(void)
+// our (limited) AlphaBlend() replacement for Windows versions not providing it
+static void
+wxAlphaBlend(HDC hdcDst, int x, int y, int w, int h,
+             int srcX, int srcY, const wxBitmap& bmp);
+
+#endif // wxHAVE_RAW_BITMAP
+
+// ----------------------------------------------------------------------------
+// private classes
+// ----------------------------------------------------------------------------
+
+// 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
+//                  restores them in the dtor
+class wxColourChanger

 {
 {

-  m_minX = 0; m_minY = 0; m_maxX = 0; m_maxY = 0;
-  m_clipping = FALSE;
+public:
+    wxColourChanger(wxDC& dc);
+   ~wxColourChanger();

 
 

-  m_filename = "";
-  m_canvas = NULL;
-  m_oldBitmap = 0;
-  m_oldPen = 0;
-  m_oldBrush = 0;
-  m_oldFont = 0;
-  m_oldPalette = 0;
-  m_minX = 0; m_minY = 0; m_maxX = 0; m_maxY = 0;
-  m_logicalOriginX = 0;
-  m_logicalOriginY = 0;
-  m_deviceOriginX = 0;
-  m_deviceOriginY = 0;
-  m_logicalScaleX = 1.0;
-  m_logicalScaleY = 1.0;
-  m_userScaleX = 1.0;
-  m_userScaleY = 1.0;
-  m_signX = 1;
-  m_signY = 1;
-  m_systemScaleX = 1.0;
-  m_systemScaleY = 1.0;
-  m_mappingMode = MM_TEXT;
-  m_bOwnsDC = FALSE;
-  m_hDC = 0;
-  m_clipping = FALSE;
-  m_ok = TRUE;
-  m_windowExtX = VIEWPORT_EXTENT;
-  m_windowExtY = VIEWPORT_EXTENT;
-  m_logicalFunction = -1;
+private:
+    wxDC& m_dc;

 
 

-  m_backgroundBrush = *wxWHITE_BRUSH;
+    COLORREF m_colFgOld, m_colBgOld;

 
 

-  m_textForegroundColour = *wxBLACK;
-  m_textBackgroundColour = *wxWHITE;
+    bool m_changed;

 
 

-  m_colour = wxColourDisplay();
+    DECLARE_NO_COPY_CLASS(wxColourChanger)
+};

 
 

-  m_hDCCount = 0;
-}
+// this class saves the old stretch blit mode during its life time
+class StretchBltModeChanger
+{
+public:
+    StretchBltModeChanger(HDC hdc,
+                          int WXUNUSED_IN_WINCE(mode))
+        : m_hdc(hdc)
+    {
+#ifndef __WXWINCE__
+        m_modeOld = ::SetStretchBltMode(m_hdc, mode);
+        if ( !m_modeOld )
+            wxLogLastError(_T("SetStretchBltMode"));
+#endif
+    }
+
+    ~StretchBltModeChanger()
+    {
+#ifndef __WXWINCE__
+        if ( !::SetStretchBltMode(m_hdc, m_modeOld) )
+            wxLogLastError(_T("SetStretchBltMode"));
+#endif
+    }
+
+private:
+    const HDC m_hdc;

 
 

+    int m_modeOld;
+
+    DECLARE_NO_COPY_CLASS(StretchBltModeChanger)
+};
+
+// helper class to cache dynamically loaded libraries and not attempt reloading
+// them if it fails
+class wxOnceOnlyDLLLoader
+{
+public:
+    // ctor argument must be a literal string as we don't make a copy of it!
+    wxOnceOnlyDLLLoader(const wxChar *dllName)
+        : m_dllName(dllName)
+    {
+    };
+
+
+    // return the symbol with the given name or NULL if the DLL not loaded
+    // or symbol not present
+    void *GetSymbol(const wxChar *name)
+    {
+        // we're prepared to handle errors here
+        wxLogNull noLog;
+
+        if ( m_dllName )
+        {
+            m_dll.Load(m_dllName);
+
+            // reset the name whether we succeeded or failed so that we don't
+            // try again the next time
+            m_dllName = NULL;
+        }
+
+        return m_dll.IsLoaded() ? m_dll.GetSymbol(name) : NULL;
+    }
+
+private:
+    wxDynamicLibrary m_dll;
+    const wxChar *m_dllName;
+};
+
+static wxOnceOnlyDLLLoader wxGDI32DLL(_T("gdi32"));
+static wxOnceOnlyDLLLoader wxMSIMG32DLL(_T("msimg32"));
+
+// ===========================================================================
+// implementation
+// ===========================================================================
+
+// ----------------------------------------------------------------------------
+// wxColourChanger
+// ----------------------------------------------------------------------------
+
+wxColourChanger::wxColourChanger(wxDC& dc) : m_dc(dc)
+{
+    const wxBrush& brush = dc.GetBrush();
+    if ( brush.Ok() && brush.GetStyle() == wxSTIPPLE_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());
+        }
+
+        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;
+    }
+}

 
 

-wxDC::~wxDC(void)
+wxColourChanger::~wxColourChanger()

 {
 {

-  if ( m_hDC != 0 ) {
-    SelectOldObjects(m_hDC);
-    if ( m_bOwnsDC ) {
-      if ( m_canvas == NULL )
-        ::DeleteDC((HDC)m_hDC);
-      else
-        ::ReleaseDC((HWND)m_canvas->GetHWND(), (HDC)m_hDC);
+    if ( m_changed )
+    {
+        // restore the colours we changed
+        HDC hdc = GetHdcOf(m_dc);
+
+        ::SetBkMode(hdc, TRANSPARENT);
+        ::SetTextColor(hdc, m_colFgOld);
+        ::SetBkColor(hdc, m_colBgOld);

     }
     }

-  }
+}
+
+// ---------------------------------------------------------------------------
+// wxDC
+// ---------------------------------------------------------------------------
+
+wxDC::~wxDC()
+{
+    if ( m_hDC != 0 )
+    {
+        SelectOldObjects(m_hDC);

 
 

+        // if we own the HDC, we delete it, otherwise we just release it
+
+        if ( m_bOwnsDC )
+        {
+            ::DeleteDC(GetHdc());
+        }
+        else // we don't own our HDC
+        {
+            if (m_canvas)
+            {
+                ::ReleaseDC(GetHwndOf(m_canvas), GetHdc());
+            }
+            else
+            {
+                // Must have been a wxScreenDC
+                ::ReleaseDC((HWND) NULL, GetHdc());
+            }
+        }
+    }

 }
 
 // This will select current objects out of the DC,
 }
 
 // This will select current objects out of the DC,


@@ -129,1580 +333,2432 @@ wxDC::~wxDC(void)
 // DC.
 void wxDC::SelectOldObjects(WXHDC dc)
 {
 // DC.
 void wxDC::SelectOldObjects(WXHDC dc)
 {

-  if (dc)
-  {
-    if (m_oldBitmap)
+    if (dc)

     {
     {

-      ::SelectObject((HDC) dc, (HBITMAP) m_oldBitmap);
-      if (m_selectedBitmap.Ok())
-      {
-        m_selectedBitmap.SetSelectedInto(NULL);
-      }
-    }
-    m_oldBitmap = 0 ;
-    if (m_oldPen)
-    {
-      ::SelectObject((HDC) dc, (HPEN) m_oldPen);
+        if (m_oldBitmap)
+        {
+            ::SelectObject((HDC) dc, (HBITMAP) m_oldBitmap);
+#ifdef __WXDEBUG__
+            if (m_selectedBitmap.Ok())
+            {
+                m_selectedBitmap.SetSelectedInto(NULL);
+            }
+#endif
+        }
+        m_oldBitmap = 0;
+        if (m_oldPen)
+        {
+            ::SelectObject((HDC) dc, (HPEN) m_oldPen);
+        }
+        m_oldPen = 0;
+        if (m_oldBrush)
+        {
+            ::SelectObject((HDC) dc, (HBRUSH) m_oldBrush);
+        }
+        m_oldBrush = 0;
+        if (m_oldFont)
+        {
+            ::SelectObject((HDC) dc, (HFONT) m_oldFont);
+        }
+        m_oldFont = 0;
+
+#if wxUSE_PALETTE
+        if (m_oldPalette)
+        {
+            ::SelectPalette((HDC) dc, (HPALETTE) m_oldPalette, FALSE);
+        }
+        m_oldPalette = 0;
+#endif // wxUSE_PALETTE

     }
     }

-    m_oldPen = 0 ;
-    if (m_oldBrush)
+
+    m_brush = wxNullBrush;
+    m_pen = wxNullPen;
+#if wxUSE_PALETTE
+    m_palette = wxNullPalette;
+#endif // wxUSE_PALETTE
+    m_font = wxNullFont;
+    m_backgroundBrush = wxNullBrush;
+    m_selectedBitmap = wxNullBitmap;
+}
+
+// ---------------------------------------------------------------------------
+// clipping
+// ---------------------------------------------------------------------------
+
+void wxDC::UpdateClipBox()
+{
+    WXMICROWIN_CHECK_HDC
+
+    RECT rect;
+    ::GetClipBox(GetHdc(), &rect);
+
+    m_clipX1 = (wxCoord) XDEV2LOG(rect.left);
+    m_clipY1 = (wxCoord) YDEV2LOG(rect.top);
+    m_clipX2 = (wxCoord) XDEV2LOG(rect.right);
+    m_clipY2 = (wxCoord) YDEV2LOG(rect.bottom);
+}
+
+void
+wxDC::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 )

     {
     {

-      ::SelectObject((HDC) dc, (HBRUSH) m_oldBrush);
+        wxDC *self = wxConstCast(this, wxDC);
+        self->UpdateClipBox();
+
+        if ( !m_clipX1 && !m_clipX2 )
+            self->m_clipping = false;

     }
     }

-    m_oldBrush = 0 ;
-    if (m_oldFont)
+
+    wxDCBase::DoGetClippingBox(x, y, w, h);
+}
+
+// common part of DoSetClippingRegion() and DoSetClippingRegionAsRegion()
+void wxDC::SetClippingHrgn(WXHRGN hrgn)
+{
+    wxCHECK_RET( hrgn, wxT("invalid clipping region") );
+
+    WXMICROWIN_CHECK_HDC
+
+    // note that we combine the new clipping region with the existing one: this
+    // is compatible with what the other ports do and is the documented
+    // behaviour now (starting with 2.3.3)
+#if defined(__WXWINCE__)
+    RECT rectClip;
+    if ( !::GetClipBox(GetHdc(), &rectClip) )
+        return;
+
+    // GetClipBox returns logical coordinates, so transform to device
+    rectClip.left = LogicalToDeviceX(rectClip.left);
+    rectClip.top = LogicalToDeviceY(rectClip.top);
+    rectClip.right = LogicalToDeviceX(rectClip.right);
+    rectClip.bottom = LogicalToDeviceY(rectClip.bottom);
+
+    HRGN hrgnDest = ::CreateRectRgn(0, 0, 0, 0);
+    HRGN hrgnClipOld = ::CreateRectRgn(rectClip.left, rectClip.top,
+                                       rectClip.right, rectClip.bottom);
+
+    if ( ::CombineRgn(hrgnDest, hrgnClipOld, (HRGN)hrgn, RGN_AND) != ERROR )

     {
     {

-      ::SelectObject((HDC) dc, (HFONT) m_oldFont);
+        ::SelectClipRgn(GetHdc(), hrgnDest);

     }
     }

-    m_oldFont = 0 ;
-    if (m_oldPalette)
+
+    ::DeleteObject(hrgnClipOld);
+    ::DeleteObject(hrgnDest);
+#else // !WinCE
+    if ( ::ExtSelectClipRgn(GetHdc(), (HRGN)hrgn, RGN_AND) == ERROR )

     {
     {

-      ::SelectPalette((HDC) dc, (HPALETTE) m_oldPalette, TRUE);
+        wxLogLastError(_T("ExtSelectClipRgn"));
+
+        return;

     }
     }

-    m_oldPalette = 0 ;
-  }
+#endif // WinCE/!WinCE
+
+    m_clipping = true;

 
 

-  m_brush = wxNullBrush ;
-  m_pen = wxNullPen;
-  m_palette = wxNullPalette;
-  m_font = wxNullFont;
-  m_backgroundBrush = wxNullBrush;
-  m_selectedBitmap = wxNullBitmap;
+    UpdateClipBox();

 }
 
 }
 

-void wxDC::SetClippingRegion(long cx, long cy, long cw, long ch)
+void wxDC::DoSetClippingRegion(wxCoord x, wxCoord y, wxCoord w, wxCoord h)

 {
 {

-  m_clipping = TRUE;
-  m_clipX1 = (int)cx;
-  m_clipY1 = (int)cy;
-  m_clipX2 = (int)(cx + cw);
-  m_clipY2 = (int)(cy + ch);
+    // the region coords are always the device ones, so do the translation
+    // manually
+    //
+    // FIXME: possible +/-1 error here, to check!
+    HRGN hrgn = ::CreateRectRgn(LogicalToDeviceX(x),
+                                LogicalToDeviceY(y),
+                                LogicalToDeviceX(x + w),
+                                LogicalToDeviceY(y + h));
+    if ( !hrgn )
+    {
+        wxLogLastError(_T("CreateRectRgn"));
+    }
+    else
+    {
+        SetClippingHrgn((WXHRGN)hrgn);

 
 

-  DoClipping((WXHDC) m_hDC);
+        ::DeleteObject(hrgn);
+    }

 }
 
 }
 

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

 {
 {

-  if (!region.GetHRGN())
-    return;
-
-  wxRect box = region.GetBox();
+    SetClippingHrgn(region.GetHRGN());
+}

 
 

-  m_clipping = TRUE;
-  m_clipX1 = box.x;
-  m_clipY1 = box.y;
-  m_clipX2 = box.x + box.width;
-  m_clipY2 = box.y + box.height;
+void wxDC::DestroyClippingRegion()
+{
+    WXMICROWIN_CHECK_HDC

 
 

-#ifdef __WIN16__
-  SelectClipRgn((HDC) m_hDC, (HRGN) region.GetHRGN());
+    if (m_clipping && m_hDC)
+    {
+#if 1
+        // On a PocketPC device (not necessarily emulator), resetting
+        // the clip region as per the old method causes bad display
+        // problems. In fact setting a null region is probably OK
+        // on desktop WIN32 also, since the WIN32 docs imply that the user
+        // clipping region is independent from the paint clipping region.
+        ::SelectClipRgn(GetHdc(), 0);

 #else
 #else

-  ExtSelectClipRgn((HDC) m_hDC, (HRGN) region.GetHRGN(), RGN_AND);
+        // TODO: this should restore the previous clipping region,
+        //       so that OnPaint processing works correctly, and the update
+        //       clipping region doesn't get destroyed after the first
+        //       DestroyClippingRegion.
+        HRGN rgn = CreateRectRgn(0, 0, 32000, 32000);
+        ::SelectClipRgn(GetHdc(), rgn);
+        ::DeleteObject(rgn);

 #endif
 #endif

+    }
+
+    wxDCBase::DestroyClippingRegion();

 }
 
 }
 

-void wxDC::DoClipping(WXHDC dc)
+// ---------------------------------------------------------------------------
+// query capabilities
+// ---------------------------------------------------------------------------
+
+bool wxDC::CanDrawBitmap() const

 {
 {

-  if (m_clipping && dc)
-  {
-    IntersectClipRect((HDC) dc, XLOG2DEV(m_clipX1), YLOG2DEV(m_clipY1),
-                          XLOG2DEV(m_clipX2), YLOG2DEV(m_clipY2));
-  }
+    return true;

 }
 
 }
 

-void wxDC::DestroyClippingRegion(void)
+bool wxDC::CanGetTextExtent() const

 {
 {

-  if (m_clipping && m_hDC)
-  {
-    // TODO: this should restore the previous clipping region,
-    // so that OnPaint processing works correctly, and the update clipping region
-    // doesn't get destroyed after the first DestroyClippingRegion.
-    HRGN rgn = CreateRectRgn(0, 0, 32000, 32000);
-    SelectClipRgn((HDC) m_hDC, rgn);
-    DeleteObject(rgn);
-  }
-  m_clipping = FALSE;
+#ifdef __WXMICROWIN__
+    // TODO Extend MicroWindows' GetDeviceCaps function
+    return true;
+#else
+    // What sort of display is it?
+    int technology = ::GetDeviceCaps(GetHdc(), TECHNOLOGY);
+
+    return (technology == DT_RASDISPLAY) || (technology == DT_RASPRINTER);
+#endif

 }
 
 }
 

-bool wxDC::CanDrawBitmap(void) const
+int wxDC::GetDepth() const

 {
 {

-  return TRUE;
+    WXMICROWIN_CHECK_HDC_RET(16)
+
+    return (int)::GetDeviceCaps(GetHdc(), BITSPIXEL);

 }
 
 }
 

-bool wxDC::CanGetTextExtent(void) const
+// ---------------------------------------------------------------------------
+// drawing
+// ---------------------------------------------------------------------------
+
+void wxDC::Clear()

 {
 {

-  // What sort of display is it?
-  int technology = ::GetDeviceCaps((HDC) m_hDC, TECHNOLOGY);
+    WXMICROWIN_CHECK_HDC
+
+    RECT rect;
+    if ( m_canvas )
+    {
+        GetClientRect((HWND) m_canvas->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())
+            return;
+
+        rect.left = -m_deviceOriginX; rect.top = -m_deviceOriginY;
+        rect.right = m_selectedBitmap.GetWidth()-m_deviceOriginX;
+        rect.bottom = m_selectedBitmap.GetHeight()-m_deviceOriginY;
+    }

 
 

-  bool ok;
+#ifndef __WXWINCE__
+    (void) ::SetMapMode(GetHdc(), MM_TEXT);
+#endif

 
 

-  if (technology != DT_RASDISPLAY && technology != DT_RASPRINTER)
-    ok = FALSE;
-  else ok = TRUE;
+    DWORD colour = ::GetBkColor(GetHdc());
+    HBRUSH brush = ::CreateSolidBrush(colour);
+    ::FillRect(GetHdc(), &rect, brush);
+    ::DeleteObject(brush);

 
 

-  return ok;
+#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

 }
 
 }
 

-void wxDC::SetPalette(const wxPalette& palette)
+bool wxDC::DoFloodFill(wxCoord WXUNUSED_IN_WINCE(x),
+                       wxCoord WXUNUSED_IN_WINCE(y),
+                       const wxColour& WXUNUSED_IN_WINCE(col),
+                       int WXUNUSED_IN_WINCE(style))

 {
 {

-  // Set the old object temporarily, in case the assignment deletes an object
-  // that's not yet selected out.
-  if (m_oldPalette)
-  {
-    ::SelectPalette((HDC) m_hDC, (HPALETTE) m_oldPalette, TRUE);
-    m_oldPalette = 0;
-  }
-
-  m_palette = m_palette;
+#ifdef __WXWINCE__
+    return false;
+#else
+    WXMICROWIN_CHECK_HDC_RET(false)

 
 

-  if (!m_palette.Ok())
-  {
-    // Setting a NULL colourmap is a way of restoring
-    // the original colourmap
-    if (m_oldPalette)
+    bool success = (0 != ::ExtFloodFill(GetHdc(), XLOG2DEV(x), YLOG2DEV(y),
+                         col.GetPixel(),
+                         style == wxFLOOD_SURFACE ? FLOODFILLSURFACE
+                                                  : FLOODFILLBORDER) ) ;
+    if (!success)

     {
     {

-      ::SelectPalette((HDC) m_hDC, (HPALETTE) m_oldPalette, TRUE);
-      m_oldPalette = 0;
+        // quoting from the MSDN docs:
+        //
+        //      Following are some of the reasons this function might fail:
+        //
+        //      * The filling could not be completed.
+        //      * The specified point has the boundary color specified by the
+        //        crColor parameter (if FLOODFILLBORDER was requested).
+        //      * The specified point does not have the color specified by
+        //        crColor (if FLOODFILLSURFACE was requested)
+        //      * The point is outside the clipping region that is, it is not
+        //        visible on the device.
+        //
+        wxLogLastError(wxT("ExtFloodFill"));

     }
 
     }
 

-    return;
-  }
-    
-  if (m_palette.Ok() && m_palette.GetHPALETTE())
-  {
-    HPALETTE oldPal = ::SelectPalette((HDC) m_hDC, (HPALETTE) m_palette.GetHPALETTE(), TRUE);
-    if (!m_oldPalette)
-      m_oldPalette = (WXHPALETTE) oldPal;
+    CalcBoundingBox(x, y);

 
 

-    ::RealizePalette((HDC) m_hDC);
-  }
+    return success;
+#endif

 }
 
 }
 

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

 {
 {

-  RECT rect;
-  if (m_canvas)
-    GetClientRect((HWND) m_canvas->GetHWND(), &rect);
-  else if (m_selectedBitmap.Ok())
-  {
-    rect.left = 0; rect.top = 0;
-    rect.right = m_selectedBitmap.GetWidth();
-    rect.bottom = m_selectedBitmap.GetHeight();
-  }
-  (void) ::SetMapMode((HDC) m_hDC, MM_TEXT);
+    WXMICROWIN_CHECK_HDC_RET(false)
+
+    wxCHECK_MSG( col, false, _T("NULL colour parameter in wxDC::GetPixel") );

 
 

-  DWORD colour = GetBkColor((HDC) m_hDC);
-  HBRUSH brush = CreateSolidBrush(colour);
-  FillRect((HDC) m_hDC, &rect, brush);
-  DeleteObject(brush);
+    // get the color of the pixel
+    COLORREF pixelcolor = ::GetPixel(GetHdc(), XLOG2DEV(x), YLOG2DEV(y));

 
 

-  ::SetMapMode((HDC) m_hDC, MM_ANISOTROPIC);
-  ::SetViewportExtEx((HDC) m_hDC, VIEWPORT_EXTENT, VIEWPORT_EXTENT, NULL);
-  ::SetWindowExtEx((HDC) m_hDC, m_windowExtX, m_windowExtY, NULL);
-  ::SetViewportOrgEx((HDC) m_hDC, (int)m_deviceOriginX, (int)m_deviceOriginY, NULL);
-  ::SetWindowOrgEx((HDC) m_hDC, (int)m_logicalOriginX, (int)m_logicalOriginY, NULL);
+    wxRGBToColour(*col, pixelcolor);
+
+    return true;

 }
 
 }
 

-void wxDC::FloodFill(long x, long y, const wxColour& col, int style)
+void wxDC::DoCrossHair(wxCoord x, wxCoord y)

 {
 {

-  (void)ExtFloodFill((HDC) m_hDC, XLOG2DEV(x), YLOG2DEV(y),
-                        col.GetPixel(),
-                        style==wxFLOOD_SURFACE?
-                          FLOODFILLSURFACE:FLOODFILLBORDER
-                        );
+    WXMICROWIN_CHECK_HDC
+
+    wxCoord x1 = x-VIEWPORT_EXTENT;
+    wxCoord y1 = y-VIEWPORT_EXTENT;
+    wxCoord x2 = x+VIEWPORT_EXTENT;
+    wxCoord y2 = y+VIEWPORT_EXTENT;

 
 

-  CalcBoundingBox(x, y);
+    wxDrawLine(GetHdc(), XLOG2DEV(x1), YLOG2DEV(y), XLOG2DEV(x2), YLOG2DEV(y));
+    wxDrawLine(GetHdc(), XLOG2DEV(x), YLOG2DEV(y1), XLOG2DEV(x), YLOG2DEV(y2));
+
+    CalcBoundingBox(x1, y1);
+    CalcBoundingBox(x2, y2);

 }
 
 }
 

-bool wxDC::GetPixel(long x, long y, wxColour *col) const
+void wxDC::DoDrawLine(wxCoord x1, wxCoord y1, wxCoord x2, wxCoord y2)

 {
 {

-  // added by steve 29.12.94 (copied from DrawPoint)
-  // returns TRUE for pixels in the color of the current pen
-  // and FALSE for all other pixels colors
-  // if col is non-NULL return the color of the pixel
+    WXMICROWIN_CHECK_HDC
+
+    wxDrawLine(GetHdc(), XLOG2DEV(x1), YLOG2DEV(y1), XLOG2DEV(x2), YLOG2DEV(y2));

 
 

-  // get the color of the pixel
-  COLORREF pixelcolor = ::GetPixel((HDC) m_hDC, XLOG2DEV(x), YLOG2DEV(y));
-  // get the color of the pen
-  COLORREF pencolor = 0x00ffffff;
-  if (m_pen.Ok())
-  {
-    pencolor = m_pen.GetColour().GetPixel() ;
-  }
-  
-  // return the color of the pixel
-  if(col)
-    col->Set(GetRValue(pixelcolor),GetGValue(pixelcolor),GetBValue(pixelcolor));
-  
-  // check, if color of the pixels is the same as the color
-  // of the current pen
-  return(pixelcolor==pencolor);
+    CalcBoundingBox(x1, y1);
+    CalcBoundingBox(x2, y2);

 }
 
 }
 

-void wxDC::CrossHair(long x, long y)
+// 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,
+                     wxCoord x2, wxCoord y2,
+                     wxCoord xc, wxCoord yc)

 {
 {

-      // We suppose that our screen is 2000x2000 max.
-      long x1 = x-2000;
-      long y1 = y-2000;
-      long x2 = x+2000;
-      long y2 = y+2000;
+#ifdef __WXWINCE__
+    // Slower emulation since WinCE doesn't support Pie and Arc
+    double r = sqrt( (x1-xc)*(x1-xc) + (y1-yc)*(y1-yc) );
+    double sa = acos((x1-xc)/r)/M_PI*180; // between 0 and 180
+    if( y1>yc ) sa = -sa; // below center
+    double ea = atan2(yc-y2, x2-xc)/M_PI*180;
+    DoDrawEllipticArcRot( xc-r, yc-r, 2*r, 2*r, sa, ea );
+#else
+
+    WXMICROWIN_CHECK_HDC

 
 

-      (void)MoveToEx((HDC) m_hDC, XLOG2DEV(x1), YLOG2DEV(y), NULL);
-      (void)LineTo((HDC) m_hDC, XLOG2DEV(x2), YLOG2DEV(y));
+    wxColourChanger cc(*this); // needed for wxSTIPPLE_MASK_OPAQUE handling

 
 

-      (void)MoveToEx((HDC) m_hDC, XLOG2DEV(x), YLOG2DEV(y1), NULL);
-      (void)LineTo((HDC) m_hDC, XLOG2DEV(x), YLOG2DEV(y2));
+    double dx = xc - x1;
+    double dy = yc - y1;
+    double radius = (double)sqrt(dx*dx+dy*dy);
+    wxCoord r = (wxCoord)radius;

 
 

-      CalcBoundingBox(x1, y1);
-      CalcBoundingBox(x2, y2);
+    // treat the special case of full circle separately
+    if ( x1 == x2 && y1 == y2 )
+    {
+        DrawEllipse(xc - r, yc - r, 2*r, 2*r);
+        return;
+    }
+
+    wxCoord xx1 = XLOG2DEV(x1);
+    wxCoord yy1 = YLOG2DEV(y1);
+    wxCoord xx2 = XLOG2DEV(x2);
+    wxCoord yy2 = YLOG2DEV(y2);
+    wxCoord xxc = XLOG2DEV(xc);
+    wxCoord yyc = YLOG2DEV(yc);
+    wxCoord ray = (wxCoord) sqrt(double((xxc-xx1)*(xxc-xx1)+(yyc-yy1)*(yyc-yy1)));
+
+    wxCoord xxx1 = (wxCoord) (xxc-ray);
+    wxCoord yyy1 = (wxCoord) (yyc-ray);
+    wxCoord xxx2 = (wxCoord) (xxc+ray);
+    wxCoord yyy2 = (wxCoord) (yyc+ray);
+
+    if ( m_brush.Ok() && m_brush.GetStyle() != wxTRANSPARENT )
+    {
+        // Have to add 1 to bottom-right corner of rectangle
+        // to make semi-circles look right (crooked line otherwise).
+        // Unfortunately this is not a reliable method, depends
+        // on the size of shape.
+        // TODO: figure out why this happens!
+        Pie(GetHdc(),xxx1,yyy1,xxx2+1,yyy2+1, xx1,yy1,xx2,yy2);
+    }
+    else
+    {
+        Arc(GetHdc(),xxx1,yyy1,xxx2,yyy2, xx1,yy1,xx2,yy2);
+    }
+
+    CalcBoundingBox(xc - r, yc - r);
+    CalcBoundingBox(xc + r, yc + r);
+#endif

 }
 
 }
 

-void wxDC::DrawLine(long x1, long y1, long x2, long y2)
+void wxDC::DoDrawCheckMark(wxCoord x1, wxCoord y1,
+                           wxCoord width, wxCoord height)

 {
 {

-  (void)MoveToEx((HDC) m_hDC, XLOG2DEV(x1), YLOG2DEV(y1), NULL);
-  (void)LineTo((HDC) m_hDC, XLOG2DEV(x2), YLOG2DEV(y2));
+    // cases when we don't have DrawFrameControl()
+#if defined(__SYMANTEC__) || defined(__WXMICROWIN__)
+    return wxDCBase::DoDrawCheckMark(x1, y1, width, height);
+#else // normal case
+    wxCoord x2 = x1 + width,
+            y2 = y1 + height;
+
+    RECT rect;
+    rect.left   = x1;
+    rect.top    = y1;
+    rect.right  = x2;
+    rect.bottom = y2;

 
 

-  /* MATTHEW: [6] New normalization */
-#if WX_STANDARD_GRAPHICS
-  (void)LineTo((HDC) m_hDC, XLOG2DEV(x2) + 1, YLOG2DEV(y2));
+#ifdef __WXWINCE__
+    DrawFrameControl(GetHdc(), &rect, DFC_BUTTON, DFCS_BUTTONCHECK);
+#else
+    DrawFrameControl(GetHdc(), &rect, DFC_MENU, DFCS_MENUCHECK);

 #endif
 
 #endif
 

-  CalcBoundingBox(x1, y1);
-  CalcBoundingBox(x2, y2);
-}
-
-void wxDC::DrawArc(long x1,long y1,long x2,long y2, long xc, long yc)
-{
-  double dx = xc-x1 ;
-  double dy = yc-y1 ;
-  double radius = (double)sqrt(dx*dx+dy*dy) ;;
-  if (x1==x2 && x2==y2)
-  {
-    DrawEllipse(xc,yc,(double)(radius*2.0),(double)(radius*2)) ;
-    return ;
-  }
-
-  long xx1 = XLOG2DEV(x1) ;
-  long yy1 = YLOG2DEV(y1) ;
-  long xx2 = XLOG2DEV(x2) ;
-  long yy2 = YLOG2DEV(y2) ;
-  long xxc = XLOG2DEV(xc) ;
-  long yyc = YLOG2DEV(yc) ;
-  long ray = (long) sqrt(double((xxc-xx1)*(xxc-xx1)+(yyc-yy1)*(yyc-yy1))) ;
-
-  (void)MoveToEx((HDC) m_hDC, (int) xx1, (int) yy1, NULL);
-  long xxx1 = (long) (xxc-ray);
-  long yyy1 = (long) (yyc-ray);
-  long xxx2 = (long) (xxc+ray);
-  long yyy2 = (long) (yyc+ray);
-  if (m_brush.Ok() && m_brush.GetStyle() !=wxTRANSPARENT)
-  {
-    // Have to add 1 to bottom-right corner of rectangle
-    // to make semi-circles look right (crooked line otherwise).
-    // Unfortunately this is not a reliable method, depends
-    // on the size of shape.
-    // TODO: figure out why this happens!
-    Pie((HDC) m_hDC,xxx1,yyy1,xxx2+1,yyy2+1,
-        xx1,yy1,xx2,yy2) ;
-  }
-  else
-    Arc((HDC) m_hDC,xxx1,yyy1,xxx2,yyy2,
-        xx1,yy1,xx2,yy2) ;
+    CalcBoundingBox(x1, y1);
+    CalcBoundingBox(x2, y2);
+#endif // Microwin/Normal
+}
+
+void wxDC::DoDrawPoint(wxCoord x, wxCoord y)
+{
+    WXMICROWIN_CHECK_HDC
+
+    COLORREF color = 0x00ffffff;
+    if (m_pen.Ok())
+    {
+        color = m_pen.GetColour().GetPixel();
+    }
+
+    SetPixel(GetHdc(), XLOG2DEV(x), YLOG2DEV(y), color);
+
+    CalcBoundingBox(x, y);
+}
+
+void wxDC::DoDrawPolygon(int n,
+                         wxPoint points[],
+                         wxCoord xoffset,
+                         wxCoord yoffset,
+                         int WXUNUSED_IN_WINCE(fillStyle))
+{
+    WXMICROWIN_CHECK_HDC
+
+    wxColourChanger cc(*this); // needed for wxSTIPPLE_MASK_OPAQUE handling
+
+    // Do things less efficiently if we have offsets
+    if (xoffset != 0 || yoffset != 0)
+    {
+        POINT *cpoints = new POINT[n];
+        int i;
+        for (i = 0; i < n; i++)
+        {
+            cpoints[i].x = (int)(points[i].x + xoffset);
+            cpoints[i].y = (int)(points[i].y + yoffset);
+
+            CalcBoundingBox(cpoints[i].x, cpoints[i].y);
+        }
+#ifndef __WXWINCE__
+        int prev = SetPolyFillMode(GetHdc(),fillStyle==wxODDEVEN_RULE?ALTERNATE:WINDING);
+#endif
+        (void)Polygon(GetHdc(), cpoints, n);
+#ifndef __WXWINCE__
+        SetPolyFillMode(GetHdc(),prev);
+#endif
+        delete[] cpoints;
+    }
+    else
+    {
+        int i;
+        for (i = 0; i < n; i++)
+            CalcBoundingBox(points[i].x, points[i].y);

 
 

-  CalcBoundingBox((xc-radius), (yc-radius));
-  CalcBoundingBox((xc+radius), (yc+radius));
+#ifndef __WXWINCE__
+        int prev = SetPolyFillMode(GetHdc(),fillStyle==wxODDEVEN_RULE?ALTERNATE:WINDING);
+#endif
+        (void)Polygon(GetHdc(), (POINT*) points, n);
+#ifndef __WXWINCE__
+        SetPolyFillMode(GetHdc(),prev);
+#endif
+    }

 }
 
 }
 

-void wxDC::DrawPoint(long x, long y)
+void
+wxDC::DoDrawPolyPolygon(int n,
+                        int count[],
+                        wxPoint points[],
+                        wxCoord xoffset,
+                        wxCoord yoffset,
+                        int fillStyle)

 {
 {

-  COLORREF color = 0x00ffffff;
-  if (m_pen.Ok())
-  {
-    color = m_pen.GetColour().GetPixel() ;
-  }
+#ifdef __WXWINCE__
+    wxDCBase::DoDrawPolyPolygon(n, count, points, xoffset, yoffset, fillStyle);
+#else
+    WXMICROWIN_CHECK_HDC

 
 

-  SetPixel((HDC) m_hDC, XLOG2DEV(x), YLOG2DEV(y), color);
+    wxColourChanger cc(*this); // needed for wxSTIPPLE_MASK_OPAQUE handling
+    int i, cnt;
+    for (i = cnt = 0; i < n; i++)
+        cnt += count[i];
+
+    // Do things less efficiently if we have offsets
+    if (xoffset != 0 || yoffset != 0)
+    {
+        POINT *cpoints = new POINT[cnt];
+        for (i = 0; i < cnt; i++)
+        {
+            cpoints[i].x = (int)(points[i].x + xoffset);
+            cpoints[i].y = (int)(points[i].y + yoffset);

 
 

-  CalcBoundingBox(x, y);
+            CalcBoundingBox(cpoints[i].x, cpoints[i].y);
+        }
+#ifndef __WXWINCE__
+        int prev = SetPolyFillMode(GetHdc(),fillStyle==wxODDEVEN_RULE?ALTERNATE:WINDING);
+#endif
+        (void)PolyPolygon(GetHdc(), cpoints, count, n);
+#ifndef __WXWINCE__
+        SetPolyFillMode(GetHdc(),prev);
+#endif
+        delete[] cpoints;
+    }
+    else
+    {
+        for (i = 0; i < cnt; i++)
+            CalcBoundingBox(points[i].x, points[i].y);
+
+#ifndef __WXWINCE__
+        int prev = SetPolyFillMode(GetHdc(),fillStyle==wxODDEVEN_RULE?ALTERNATE:WINDING);
+#endif
+        (void)PolyPolygon(GetHdc(), (POINT*) points, count, n);
+#ifndef __WXWINCE__
+        SetPolyFillMode(GetHdc(),prev);
+#endif
+    }
+#endif
+  // __WXWINCE__

 }
 
 }
 

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

 {
 {

-  // Do things less efficiently if we have offsets
-  if (xoffset != 0 || yoffset != 0)
-  {
-    POINT *cpoints = new POINT[n];
-    int i;
-    for (i = 0; i < n; i++)
+    WXMICROWIN_CHECK_HDC
+
+    // Do things less efficiently if we have offsets
+    if (xoffset != 0 || yoffset != 0)

     {
     {

-        cpoints[i].x = (int)(points[i].x + xoffset);
-        cpoints[i].y = (int)(points[i].y + yoffset);
+        POINT *cpoints = new POINT[n];
+        int i;
+        for (i = 0; i < n; i++)
+        {
+            cpoints[i].x = (int)(points[i].x + xoffset);
+            cpoints[i].y = (int)(points[i].y + yoffset);

 
 

-        CalcBoundingBox(cpoints[i].x, cpoints[i].y);
+            CalcBoundingBox(cpoints[i].x, cpoints[i].y);
+        }
+        (void)Polyline(GetHdc(), cpoints, n);
+        delete[] cpoints;

     }
     }

-    int prev = SetPolyFillMode((HDC) m_hDC,fillStyle==wxODDEVEN_RULE?ALTERNATE:WINDING) ;
-    (void)Polygon((HDC) m_hDC, cpoints, n);
-    SetPolyFillMode((HDC) m_hDC,prev) ;
-    delete[] cpoints;
-  }
-  else
-  {
-    int i;
-    for (i = 0; i < n; i++)
-        CalcBoundingBox(points[i].x, points[i].y);
+    else
+    {
+        int i;
+        for (i = 0; i < n; i++)
+            CalcBoundingBox(points[i].x, points[i].y);

 
 

-    int prev = SetPolyFillMode((HDC) m_hDC,fillStyle==wxODDEVEN_RULE?ALTERNATE:WINDING) ;
-    (void)Polygon((HDC) m_hDC, (POINT*) points, n);
-    SetPolyFillMode((HDC) m_hDC,prev) ;
-  }
+        (void)Polyline(GetHdc(), (POINT*) points, n);
+    }

 }
 
 }
 

-void wxDC::DrawLines(int n, wxPoint points[], long xoffset, long yoffset)
+void wxDC::DoDrawRectangle(wxCoord x, wxCoord y, wxCoord width, wxCoord height)

 {
 {

-  // Do things less efficiently if we have offsets
-  if (xoffset != 0 || yoffset != 0)
-  {
-    POINT *cpoints = new POINT[n];
-    int i;
-    for (i = 0; i < n; i++)
+    WXMICROWIN_CHECK_HDC
+
+    wxColourChanger 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

     {
     {

-        cpoints[i].x = (int)(points[i].x + xoffset);
-        cpoints[i].y = (int)(points[i].y + yoffset);
-
-        CalcBoundingBox(cpoints[i].x, cpoints[i].y);
-    }
-    (void)Polyline((HDC) m_hDC, cpoints, n);
-    delete[] cpoints;
-  }
-  else
-  {
-    int i;
-    for (i = 0; i < n; i++)
-        CalcBoundingBox(points[i].x, points[i].y);
-
-    (void)Polyline((HDC) m_hDC, (POINT*) points, n);
-  }
-}
-
-void wxDC::DrawRectangle(long x, long y, long width, long height)
+        // 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
+
+        // I wonder if this shouldn´t be done after the LOG2DEV() conversions. RR.
+        if ( m_pen.GetStyle() == wxTRANSPARENT )
+        {
+            // Apparently not needed for WinCE (see e.g. Life! demo)
+#ifndef __WXWINCE__
+            x2++;
+            y2++;
+#endif
+        }
+
+        (void)Rectangle(GetHdc(), XLOG2DEV(x), YLOG2DEV(y), XLOG2DEV(x2), YLOG2DEV(y2));
+    }
+
+
+    CalcBoundingBox(x, y);
+    CalcBoundingBox(x2, y2);
+}
+
+void wxDC::DoDrawRoundedRectangle(wxCoord x, wxCoord y, wxCoord width, wxCoord height, double radius)

 {
 {

-  long x2 = x + width;
-  long y2 = y + height;
+    WXMICROWIN_CHECK_HDC

 
 

-/* MATTHEW: [6] new normalization */
-#if WX_STANDARD_GRAPHICS
-  bool do_brush, do_pen;
+    wxColourChanger cc(*this); // needed for wxSTIPPLE_MASK_OPAQUE handling

 
 

-  do_brush = m_brush.Ok() && m_brush.GetStyle() != wxTRANSPARENT;
-  do_pen = m_pen.Ok() && m_pen.GetStyle() != wxTRANSPARENT;
+    // Now, a negative radius value is interpreted to mean
+    // 'the proportion of the smallest X or Y dimension'

 
 

-  if (do_brush) {
-     HPEN orig_pen = NULL;
+    if (radius < 0.0)
+    {
+        double smallest = (width < height) ? width : height;
+        radius = (- radius * smallest);
+    }
+
+    wxCoord x2 = (x+width);
+    wxCoord y2 = (y+height);

 
 

-     if (do_pen || !m_pen.Ok())
-        orig_pen = (HPEN) ::SelectObject((HDC) m_hDC, (HPEN) ::GetStockObject(NULL_PEN));
+    // 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 )
+    {
+        x2++;
+        y2++;
+    }

 
 

-     (void)Rectangle((HDC) m_hDC, XLOG2DEV(x), YLOG2DEV(y),
-          XLOG2DEV(x2) + 1, YLOG2DEV(y2) + 1);
+    (void)RoundRect(GetHdc(), XLOG2DEV(x), YLOG2DEV(y), XLOG2DEV(x2),
+        YLOG2DEV(y2), (int) (2*XLOG2DEV(radius)), (int)( 2*YLOG2DEV(radius)));

 
 

-     if (do_pen || !m_pen.Ok())
-        ::SelectObject((HDC) m_hDC , orig_pen);
-  }
-  if (do_pen) {
-     HBRUSH orig_brush = NULL;
+    CalcBoundingBox(x, y);
+    CalcBoundingBox(x2, y2);
+}
+
+void wxDC::DoDrawEllipse(wxCoord x, wxCoord y, wxCoord width, wxCoord height)
+{
+    WXMICROWIN_CHECK_HDC

 
 

-     if (do_brush || !m_brush.Ok())
-        orig_brush = (HBRUSH) ::SelectObject((HDC) m_hDC, (HBRUSH) ::GetStockObject(NULL_BRUSH));
+    wxColourChanger cc(*this); // needed for wxSTIPPLE_MASK_OPAQUE handling

 
 

-     (void)Rectangle((HDC) m_hDC, XLOG2DEV(x), YLOG2DEV(y),
-          XLOG2DEV(x2), YLOG2DEV(y2));
+    wxCoord x2 = (x+width);
+    wxCoord y2 = (y+height);

 
 

-     if (do_brush || !m_brush.Ok())
-        ::SelectObject((HDC) m_hDC, orig_brush);
-  }
+    (void)Ellipse(GetHdc(), XLOG2DEV(x), YLOG2DEV(y), XLOG2DEV(x2), YLOG2DEV(y2));
+
+    CalcBoundingBox(x, y);
+    CalcBoundingBox(x2, y2);
+}
+
+#if wxUSE_SPLINES
+void wxDC::DoDrawSpline(wxList *points)
+{
+#ifdef  __WXWINCE__
+    // WinCE does not support ::PolyBezier so use generic version
+    wxDCBase::DoDrawSpline(points);

 #else
 #else

-  (void)Rectangle((HDC) m_hDC, XLOG2DEV(x), YLOG2DEV(y), XLOG2DEV(x2), YLOG2DEV(y2));
-#endif
+    // quadratic b-spline to cubic bezier spline conversion
+    //
+    // quadratic spline with control points P0,P1,P2
+    // P(s) = P0*(1-s)^2 + P1*2*(1-s)*s + P2*s^2
+    //
+    // bezier spline with control points B0,B1,B2,B3
+    // B(s) = B0*(1-s)^3 + B1*3*(1-s)^2*s + B2*3*(1-s)*s^2 + B3*s^3
+    //
+    // control points of bezier spline calculated from b-spline
+    // B0 = P0
+    // B1 = (2*P1 + P0)/3
+    // B2 = (2*P1 + P2)/3
+    // B3 = P2
+
+    WXMICROWIN_CHECK_HDC
+
+    wxASSERT_MSG( points, wxT("NULL pointer to spline points?") );
+
+    const size_t n_points = points->GetCount();
+    wxASSERT_MSG( n_points > 2 , wxT("incomplete list of spline points?") );
+
+    const size_t n_bezier_points = n_points * 3 + 1;
+    POINT *lppt = (POINT *)malloc(n_bezier_points*sizeof(POINT));
+    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();
+    lppt[ bezier_pos ].x = x1 = p->x;
+    lppt[ bezier_pos ].y = y1 = p->y;
+    bezier_pos++;
+    lppt[ bezier_pos ] = lppt[ bezier_pos-1 ];
+    bezier_pos++;
+
+    node = node->GetNext();
+    p = (wxPoint *)node->GetData();
+
+    x2 = p->x;
+    y2 = p->y;
+    cx1 = ( x1 + x2 ) / 2;
+    cy1 = ( y1 + y2 ) / 2;
+    lppt[ bezier_pos ].x = XLOG2DEV(cx1);
+    lppt[ bezier_pos ].y = YLOG2DEV(cy1);
+    bezier_pos++;
+    lppt[ bezier_pos ] = lppt[ bezier_pos-1 ];
+    bezier_pos++;
+
+#if !wxUSE_STL
+    while ((node = node->GetNext()) != NULL)
+#else
+    while ((node = node->GetNext()))
+#endif // !wxUSE_STL
+    {
+        p = (wxPoint *)node->GetData();
+        x1 = x2;
+        y1 = y2;
+        x2 = p->x;
+        y2 = p->y;
+        cx4 = (x1 + x2) / 2;
+        cy4 = (y1 + y2) / 2;
+        // B0 is B3 of previous segment
+        // B1:
+        lppt[ bezier_pos ].x = XLOG2DEV((x1*2+cx1)/3);
+        lppt[ bezier_pos ].y = YLOG2DEV((y1*2+cy1)/3);
+        bezier_pos++;
+        // B2:
+        lppt[ bezier_pos ].x = XLOG2DEV((x1*2+cx4)/3);
+        lppt[ bezier_pos ].y = YLOG2DEV((y1*2+cy4)/3);
+        bezier_pos++;
+        // B3:
+        lppt[ bezier_pos ].x = XLOG2DEV(cx4);
+        lppt[ bezier_pos ].y = YLOG2DEV(cy4);
+        bezier_pos++;
+        cx1 = cx4;
+        cy1 = cy4;
+    }

 
 

-  CalcBoundingBox(x, y);
-  CalcBoundingBox(x2, y2);
+    lppt[ bezier_pos ] = lppt[ bezier_pos-1 ];
+    bezier_pos++;
+    lppt[ bezier_pos ].x = XLOG2DEV(x2);
+    lppt[ bezier_pos ].y = YLOG2DEV(y2);
+    bezier_pos++;
+    lppt[ bezier_pos ] = lppt[ bezier_pos-1 ];
+    bezier_pos++;
+
+    ::PolyBezier( GetHdc(), lppt, bezier_pos );
+
+    free(lppt);
+#endif

 }
 }

+#endif

 
 

-void wxDC::DrawRoundedRectangle(long x, long y, long width, long height, double radius)
+// 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)

 {
 {

-  // Now, a negative radius value is interpreted to mean
-  // 'the proportion of the smallest X or Y dimension'
+#ifdef __WXWINCE__
+    DoDrawEllipticArcRot( x, y, w, h, sa, ea );
+#else
+
+    WXMICROWIN_CHECK_HDC
+
+    wxColourChanger cc(*this); // needed for wxSTIPPLE_MASK_OPAQUE handling
+
+    wxCoord x2 = x + w;
+    wxCoord y2 = y + h;
+
+    int rx1 = XLOG2DEV(x+w/2);
+    int ry1 = YLOG2DEV(y+h/2);
+    int rx2 = rx1;
+    int ry2 = ry1;
+
+    sa = DegToRad(sa);
+    ea = DegToRad(ea);
+
+    rx1 += (int)(100.0 * abs(w) * cos(sa));
+    ry1 -= (int)(100.0 * abs(h) * m_signY * sin(sa));
+    rx2 += (int)(100.0 * abs(w) * cos(ea));
+    ry2 -= (int)(100.0 * abs(h) * m_signY * sin(ea));

 
 

-  if (radius < 0.0)
-  {
-    double smallest = 0.0;
-    if (width < height)
-      smallest = width;
+    // 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));
+    if (m_signY > 0)
+    {
+        (void)Pie(GetHdc(), XLOG2DEV(x), YLOG2DEV(y), XLOG2DEV(x2)+1, YLOG2DEV(y2)+1,
+                  rx1, ry1, rx2, ry2);
+    }

     else
     else

-      smallest = height;
-    radius = (- radius * smallest);
-  }
+    {
+        (void)Pie(GetHdc(), XLOG2DEV(x), YLOG2DEV(y)-1, XLOG2DEV(x2)+1, YLOG2DEV(y2),
+                  rx1, ry1-1, rx2, ry2-1);
+    }

 
 

-  long x2 = (x+width);
-  long y2 = (y+height);
+    ::SelectObject(GetHdc(), hpenOld);

 
 

-  (void)RoundRect((HDC) m_hDC, XLOG2DEV(x), YLOG2DEV(y), XLOG2DEV(x2),
-                      YLOG2DEV(y2), 2*XLOG2DEV(radius), 2*YLOG2DEV(radius));
+    (void)Arc(GetHdc(), XLOG2DEV(x), YLOG2DEV(y), XLOG2DEV(x2), YLOG2DEV(y2),
+              rx1, ry1, rx2, ry2);

 
 

-  CalcBoundingBox(x, y);
-  CalcBoundingBox(x2, y2);
+    CalcBoundingBox(x, y);
+    CalcBoundingBox(x2, y2);
+#endif

 }
 
 }
 

-void wxDC::DrawEllipse(long x, long y, long width, long height)
+void wxDC::DoDrawIcon(const wxIcon& icon, wxCoord x, wxCoord y)

 {
 {

-  long x2 = (x+width);
-  long y2 = (y+height);
+    WXMICROWIN_CHECK_HDC
+
+    wxCHECK_RET( icon.Ok(), wxT("invalid icon in DrawIcon") );

 
 

-  (void)Ellipse((HDC) m_hDC, XLOG2DEV(x), YLOG2DEV(y), XLOG2DEV(x2), YLOG2DEV(y2));
+#ifdef __WIN32__
+    ::DrawIconEx(GetHdc(), XLOG2DEV(x), YLOG2DEV(y), GetHiconOf(icon), icon.GetWidth(), icon.GetHeight(), 0, NULL, DI_NORMAL);
+#else
+    ::DrawIcon(GetHdc(), XLOG2DEV(x), YLOG2DEV(y), GetHiconOf(icon));
+#endif

 
 

-  CalcBoundingBox(x, y);
-  CalcBoundingBox(x2, y2);
+    CalcBoundingBox(x, y);
+    CalcBoundingBox(x + icon.GetWidth(), y + icon.GetHeight());

 }
 
 }
 

-// Chris Breeze 20/5/98: first implementation of DrawEllipticArc on Windows
-void wxDC::DrawEllipticArc(long x,long y,long w,long h,double sa,double ea)
-{
-  long x2 = (x+w);
-  long y2 = (y+h);
-
-  const double deg2rad = 3.14159265359 / 180.0;
-  int rx1 = XLOG2DEV(x+w/2);
-  int ry1 = YLOG2DEV(y+h/2);
-  int rx2 = rx1;
-  int ry2 = ry1;
-  rx1 += (int)(100.0 * abs(w) * cos(sa * deg2rad));
-  ry1 -= (int)(100.0 * abs(h) * m_signY * sin(sa * deg2rad));
-  rx2 += (int)(100.0 * abs(w) * cos(ea * deg2rad));
-  ry2 -= (int)(100.0 * abs(h) * m_signY * sin(ea * deg2rad));
-
-  // draw pie with NULL_PEN first and then outline otherwise a line is
-  // drawn from the start and end points to the centre
-  HPEN orig_pen = (HPEN) ::SelectObject((HDC) m_hDC, (HPEN) ::GetStockObject(NULL_PEN));
-  if (m_signY > 0)
-  {
-    (void)Pie((HDC) m_hDC, XLOG2DEV(x), YLOG2DEV(y), XLOG2DEV(x2)+1, YLOG2DEV(y2)+1,
-        rx1, ry1, rx2, ry2);
-  }
-  else
-  {
-    (void)Pie((HDC) m_hDC, XLOG2DEV(x), YLOG2DEV(y)-1, XLOG2DEV(x2)+1, YLOG2DEV(y2),
-        rx1, ry1-1, rx2, ry2-1);
-  }
-  ::SelectObject((HDC) m_hDC, orig_pen);
-  (void)Arc((HDC) m_hDC, XLOG2DEV(x), YLOG2DEV(y), XLOG2DEV(x2), YLOG2DEV(y2),
-      rx1, ry1, rx2, ry2);
-
-  CalcBoundingBox(x, y);
-  CalcBoundingBox(x2, y2);
-}
-
-void wxDC::DrawIcon(const wxIcon& icon, long x, long y)
-{
-  ::DrawIcon((HDC) m_hDC, XLOG2DEV(x), YLOG2DEV(y), (HICON) icon.GetHICON());
-  CalcBoundingBox(x, y);
-  CalcBoundingBox(x+icon.GetWidth(), y+icon.GetHeight());
-}
-
-void wxDC::DrawBitmap( const wxBitmap &bmp, long x, long y, bool useMask )
-{
-    if (!bmp.Ok())
-        return;
+void wxDC::DoDrawBitmap( const wxBitmap &bmp, wxCoord x, wxCoord y, bool useMask )
+{
+    WXMICROWIN_CHECK_HDC
+
+    wxCHECK_RET( bmp.Ok(), _T("invalid bitmap in wxDC::DrawBitmap") );
+
+    int width = bmp.GetWidth(),
+        height = bmp.GetHeight();
+
+    HBITMAP hbmpMask = 0;
+
+#if wxUSE_PALETTE
+    HPALETTE oldPal = 0;
+#endif // wxUSE_PALETTE

 
 

-    // If we're not drawing transparently, and not drawing to a printer,
-    // optimize this function to use Windows functions.
-    if (!useMask && !IsKindOf(CLASSINFO(wxPrinterDC)))
+    if ( bmp.HasAlpha() )
+    {
+        MemoryHDC hdcMem;
+        SelectInHDC select(hdcMem, GetHbitmapOf(bmp));
+
+        if ( AlphaBlt(GetHdc(), x, y, width, height, 0, 0, hdcMem, bmp) )
+            return;
+    }
+
+    if ( useMask )
+    {
+        wxMask *mask = bmp.GetMask();
+        if ( mask )
+            hbmpMask = (HBITMAP)mask->GetMaskBitmap();
+
+        if ( !hbmpMask )
+        {
+            // don't give assert here because this would break existing
+            // programs - just silently ignore useMask parameter
+            useMask = false;
+        }
+    }
+    if ( useMask )
+    {
+#ifdef __WIN32__
+        // use MaskBlt() with ROP which doesn't do anything to dst in the mask
+        // points
+        // On some systems, MaskBlt succeeds yet is much much slower
+        // than the wxWidgets fall-back implementation. So we need
+        // to be able to switch this on and off at runtime.
+        bool ok = false;
+#if wxUSE_SYSTEM_OPTIONS
+        if (wxSystemOptions::GetOptionInt(wxT("no-maskblt")) == 0)
+#endif
+        {
+            HDC cdc = GetHdc();
+            HDC hdcMem = ::CreateCompatibleDC(GetHdc());
+            HGDIOBJ hOldBitmap = ::SelectObject(hdcMem, GetHbitmapOf(bmp));
+#if wxUSE_PALETTE
+            wxPalette *pal = bmp.GetPalette();
+            if ( pal && ::GetDeviceCaps(cdc,BITSPIXEL) <= 8 )
+            {
+                oldPal = ::SelectPalette(hdcMem, GetHpaletteOf(*pal), FALSE);
+                ::RealizePalette(hdcMem);
+            }
+#endif // wxUSE_PALETTE
+
+            ok = ::MaskBlt(cdc, x, y, width, height,
+                            hdcMem, 0, 0,
+                            hbmpMask, 0, 0,
+                            MAKEROP4(SRCCOPY, DSTCOPY)) != 0;
+
+#if wxUSE_PALETTE
+            if (oldPal)
+                ::SelectPalette(hdcMem, oldPal, FALSE);
+#endif // wxUSE_PALETTE
+
+            ::SelectObject(hdcMem, hOldBitmap);
+            ::DeleteDC(hdcMem);
+        }
+
+        if ( !ok )
+#endif // Win32
+        {
+            // Rather than reproduce wxDC::Blit, let's do it at the wxWin API
+            // level
+            wxMemoryDC memDC;
+            memDC.SelectObject(bmp);
+
+            Blit(x, y, width, height, &memDC, 0, 0, wxCOPY, useMask);
+
+            memDC.SelectObject(wxNullBitmap);
+        }
+    }
+    else // no mask, just use BitBlt()

     {
     {

-        HDC cdc = (HDC)m_hDC;
+        HDC cdc = GetHdc();

         HDC memdc = ::CreateCompatibleDC( cdc );
         HBITMAP hbitmap = (HBITMAP) bmp.GetHBITMAP( );
         HDC memdc = ::CreateCompatibleDC( cdc );
         HBITMAP hbitmap = (HBITMAP) bmp.GetHBITMAP( );

-        ::SelectObject( memdc, hbitmap );
-        ::BitBlt( cdc, x, y, bmp.GetWidth(), bmp.GetHeight(), memdc, 0, 0, SRCCOPY);
-        ::SelectObject( memdc, 0 );
+
+        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() );
+        }
+
+#if wxUSE_PALETTE
+        wxPalette *pal = bmp.GetPalette();
+        if ( pal && ::GetDeviceCaps(cdc,BITSPIXEL) <= 8 )
+        {
+            oldPal = ::SelectPalette(memdc, GetHpaletteOf(*pal), FALSE);
+            ::RealizePalette(memdc);
+        }
+#endif // wxUSE_PALETTE
+
+        HGDIOBJ hOldBitmap = ::SelectObject( memdc, hbitmap );
+        ::BitBlt( cdc, x, y, width, height, memdc, 0, 0, SRCCOPY);
+
+#if wxUSE_PALETTE
+        if (oldPal)
+            ::SelectPalette(memdc, oldPal, FALSE);
+#endif // wxUSE_PALETTE
+
+        ::SelectObject( memdc, hOldBitmap );

         ::DeleteDC( memdc );
         ::DeleteDC( memdc );

+
+        ::SetTextColor(GetHdc(), old_textground);
+        ::SetBkColor(GetHdc(), old_background);
+    }
+}
+
+void wxDC::DoDrawText(const wxString& text, wxCoord x, wxCoord y)
+{
+    WXMICROWIN_CHECK_HDC
+
+    DrawAnyText(text, x, y);
+
+    // update the bounding box
+    CalcBoundingBox(x, y);
+
+    wxCoord w, h;
+    GetTextExtent(text, &w, &h);
+    CalcBoundingBox(x + w, y + h);
+}
+
+void wxDC::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());
+
+    DWORD old_background = 0;
+    if ( m_textBackgroundColour.Ok() )
+    {
+        old_background = SetBkColor(GetHdc(), m_textBackgroundColour.GetPixel() );
+    }
+
+    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,
+                             wxCoord x, wxCoord y,
+                             double angle)
+{
+    WXMICROWIN_CHECK_HDC
+
+    // we test that we have some font because otherwise we should still use the
+    // "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() )
+    {
+        DoDrawText(text, x, y);
+    }
+#ifndef __WXMICROWIN__

     else
     {
     else
     {

-        // Rather than reproduce wxDC::Blit, let's do it at the wxWin API level
-        wxMemoryDC memDC;
-        memDC.SelectObject(bmp);
+        // 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;
+        HFONT hfont = (HFONT)font.GetResourceHandle();
+        LOGFONT lf;
+        if ( ::GetObject(hfont, sizeof(lf), &lf) == 0 )
+        {
+            wxLogLastError(wxT("GetObject(hfont)"));
+        }

 
 

-        /* Not sure if we need this. The mask should leave the
-         * masked areas as per the original background of this DC.
-         */
-/*
-        // There might be transparent areas, so make these
-        // the same colour as this DC
-        memDC.SetBackground(* GetBackground());
-        memDC.Clear();
-*/
+        // GDI wants the angle in tenth of degree
+        long angle10 = (long)(angle * 10);
+        lf.lfEscapement = angle10;
+        lf. lfOrientation = angle10;

 
 

-        Blit(x, y, bmp.GetWidth(), bmp.GetHeight(), & memDC, 0, 0, wxCOPY, useMask);
+        hfont = ::CreateFontIndirect(&lf);
+        if ( !hfont )
+        {
+            wxLogLastError(wxT("CreateFont"));
+        }
+        else
+        {
+            HFONT hfontOld = (HFONT)::SelectObject(GetHdc(), hfont);
+
+            DrawAnyText(text, x, y);
+
+            (void)::SelectObject(GetHdc(), hfontOld);
+            (void)::DeleteObject(hfont);
+        }
+
+        // call the bounding box by adding all four vertices of the rectangle
+        // 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);
+
+        double rad = DegToRad(angle);

 
 

-        memDC.SelectObject(wxNullBitmap);
+        // "upper left" and "upper right"
+        CalcBoundingBox(x, y);
+        CalcBoundingBox(x + wxCoord(w*cos(rad)), y - wxCoord(w*sin(rad)));
+
+        // "bottom left" and "bottom right"
+        x += (wxCoord)(h*sin(rad));
+        y += (wxCoord)(h*cos(rad));
+        CalcBoundingBox(x, y);
+        CalcBoundingBox(x + wxCoord(w*cos(rad)), y - wxCoord(w*sin(rad)));

     }
     }

+#endif

 }
 
 }
 

-void wxDC::SetFont(const wxFont& the_font)
+// ---------------------------------------------------------------------------
+// set GDI objects
+// ---------------------------------------------------------------------------
+
+#if wxUSE_PALETTE
+
+void wxDC::DoSelectPalette(bool realize)

 {
 {

-  // Set the old object temporarily, in case the assignment deletes an object
-  // that's not yet selected out.
-  if (m_oldFont)
-  {
-    ::SelectObject((HDC) m_hDC, (HFONT) m_oldFont);
-    m_oldFont = 0;
-  }
+    WXMICROWIN_CHECK_HDC

 
 

-  m_font = the_font;
+    // Set the old object temporarily, in case the assignment deletes an object
+    // that's not yet selected out.
+    if (m_oldPalette)
+    {
+        ::SelectPalette(GetHdc(), (HPALETTE) m_oldPalette, FALSE);
+        m_oldPalette = 0;
+    }

 
 

-  if (!the_font.Ok())
-  {
-    if (m_oldFont)
-      ::SelectObject((HDC) m_hDC, (HFONT) m_oldFont);
-    m_oldFont = 0 ;
-  }
+    if ( m_palette.Ok() )
+    {
+        HPALETTE oldPal = ::SelectPalette(GetHdc(),
+                                          GetHpaletteOf(m_palette),
+                                          false);
+        if (!m_oldPalette)
+            m_oldPalette = (WXHPALETTE) oldPal;
+
+        if (realize)
+            ::RealizePalette(GetHdc());
+    }
+}
+
+void wxDC::SetPalette(const wxPalette& palette)
+{
+    if ( palette.Ok() )
+    {
+        m_palette = palette;
+        DoSelectPalette(true);
+    }
+}
+
+void wxDC::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();

 
 

-  if (m_font.Ok() && m_font.GetResourceHandle())
-  {
-    HFONT f = (HFONT) ::SelectObject((HDC) m_hDC, (HFONT) m_font.GetResourceHandle());
-    if (f == NULL)
+        m_hasCustomPalette = win && win->HasCustomPalette();
+        if ( m_hasCustomPalette )
+        {
+            m_palette = win->GetPalette();
+
+            // turn on MSW translation for this palette
+            DoSelectPalette();
+        }
+    }
+}
+
+#endif // wxUSE_PALETTE
+
+// 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)
+{
+    WXMICROWIN_CHECK_HDC
+
+    if ( font == m_font )
+        return;
+
+    if ( font.Ok() )
+    {
+        HGDIOBJ hfont = ::SelectObject(GetHdc(), GetHfontOf(font));
+        if ( hfont == HGDI_ERROR )
+        {
+            wxLogLastError(_T("SelectObject(font)"));
+        }
+        else // selected ok
+        {
+            if ( !m_oldFont )
+                m_oldFont = (WXHFONT)hfont;
+
+            m_font = font;
+        }
+    }
+    else // invalid font, reset the current font

     {
     {

-        wxDebugMsg("::SelectObject failed in wxDC::SetFont.");
+        if ( m_oldFont )
+        {
+            if ( ::SelectObject(GetHdc(), (HPEN) m_oldFont) == HGDI_ERROR )
+            {
+                wxLogLastError(_T("SelectObject(old font)"));
+            }
+
+            m_oldFont = 0;
+        }
+
+        m_font = wxNullFont;

     }
     }

-    if (!m_oldFont)
-      m_oldFont = (WXHFONT) f;
-  }

 }
 
 void wxDC::SetPen(const wxPen& pen)
 {
 }
 
 void wxDC::SetPen(const wxPen& pen)
 {

-  // Set the old object temporarily, in case the assignment deletes an object
-  // that's not yet selected out.
-  if (m_oldPen)
-  {
-    ::SelectObject((HDC) m_hDC, (HPEN) m_oldPen);
-    m_oldPen = 0;
-  }
+    WXMICROWIN_CHECK_HDC

 
 

-  m_pen = pen;
+    if ( pen == m_pen )
+        return;

 
 

-  if (!m_pen.Ok())
-  {
-    if (m_oldPen)
-      ::SelectObject((HDC) m_hDC, (HPEN) m_oldPen);
-    m_oldPen = 0 ;
-  }
+    if ( pen.Ok() )
+    {
+        HGDIOBJ hpen = ::SelectObject(GetHdc(), GetHpenOf(pen));
+        if ( hpen == HGDI_ERROR )
+        {
+            wxLogLastError(_T("SelectObject(pen)"));
+        }
+        else // selected ok
+        {
+            if ( !m_oldPen )
+                m_oldPen = (WXHPEN)hpen;

 
 

-  if (m_pen.Ok())
-  {
-    if (m_pen.GetResourceHandle())
+            m_pen = pen;
+        }
+    }
+    else // invalid pen, reset the current pen

     {
     {

-      HPEN p = (HPEN) ::SelectObject((HDC) m_hDC, (HPEN)m_pen.GetResourceHandle()) ;
-      if (!m_oldPen)
-        m_oldPen = (WXHPEN) p;
+        if ( m_oldPen )
+        {
+            if ( ::SelectObject(GetHdc(), (HPEN) m_oldPen) == HGDI_ERROR )
+            {
+                wxLogLastError(_T("SelectObject(old pen)"));
+            }
+
+            m_oldPen = 0;
+        }
+
+        m_pen = wxNullPen;

     }
     }

-  }

 }
 
 void wxDC::SetBrush(const wxBrush& brush)
 {
 }
 
 void wxDC::SetBrush(const wxBrush& brush)
 {

-  // Set the old object temporarily, in case the assignment deletes an object
-  // that's not yet selected out.
-  if (m_oldBrush)
-  {
-    ::SelectObject((HDC) m_hDC, (HBRUSH) m_oldBrush);
-    m_oldBrush = 0;
-  }
-
-  m_brush = brush;
-
-  if (!m_brush.Ok())
-  {
-    if (m_oldBrush)
-      ::SelectObject((HDC) m_hDC, (HBRUSH) m_oldBrush);
-    m_oldBrush = 0 ;
-  }
-
-  if (m_brush.Ok())
-  {
-    if (m_brush.GetResourceHandle())
-    {
-      HBRUSH b = 0;
-      b = (HBRUSH) ::SelectObject((HDC) m_hDC, (HBRUSH)m_brush.GetResourceHandle()) ;
-      if (!m_oldBrush)
-        m_oldBrush = (WXHBRUSH) b;
-    }
-  }
-}
-
-void wxDC::DrawText(const wxString& text, long x, long y, bool use16bit)
-{
-    // Should be unnecessary: SetFont should have done this already.
-#if 0
-  if (m_font.Ok() && m_font.GetResourceHandle())
-  {
-    HFONT f = (HFONT) ::SelectObject((HDC) m_hDC, (HFONT) m_font.GetResourceHandle());
-    if (!m_oldFont)
-      m_oldFont = (WXHFONT) f;
-  }
-#endif
+    WXMICROWIN_CHECK_HDC

 
 

-  if (m_textForegroundColour.Ok())
-    SetTextColor((HDC) m_hDC, m_textForegroundColour.GetPixel() ) ;
-
-  DWORD old_background = 0;
-  if (m_textBackgroundColour.Ok())
-  {
-    old_background = SetBkColor((HDC) m_hDC, m_textBackgroundColour.GetPixel() ) ;
-  }
+    if ( brush == m_brush )
+        return;

 
 

-  if (m_backgroundMode == wxTRANSPARENT)
-    SetBkMode((HDC) m_hDC, TRANSPARENT);
-  else
-    SetBkMode((HDC) m_hDC, OPAQUE);
+    if ( brush.Ok() )
+    {
+        // we must make sure the brush is aligned with the logical coordinates
+        // before selecting it
+        wxBitmap *stipple = brush.GetStipple();
+        if ( stipple && stipple->Ok() )
+        {
+            if ( !::SetBrushOrgEx
+                    (
+                        GetHdc(),
+                        m_deviceOriginX % stipple->GetWidth(),
+                        m_deviceOriginY % stipple->GetHeight(),
+                        NULL                    // [out] previous brush origin
+                    ) )
+            {
+                wxLogLastError(_T("SetBrushOrgEx()"));
+            }
+        }

 
 

-  (void)TextOut((HDC) m_hDC, XLOG2DEV(x), YLOG2DEV(y), (char *) (const char *)text, strlen((const char *)text));
+        HGDIOBJ hbrush = ::SelectObject(GetHdc(), GetHbrushOf(brush));
+        if ( hbrush == HGDI_ERROR )
+        {
+            wxLogLastError(_T("SelectObject(brush)"));
+        }
+        else // selected ok
+        {
+            if ( !m_oldBrush )
+                m_oldBrush = (WXHBRUSH)hbrush;

 
 

-  if (m_textBackgroundColour.Ok())
-    (void)SetBkColor((HDC) m_hDC, old_background);
+            m_brush = brush;
+        }
+    }
+    else // invalid brush, reset the current brush
+    {
+        if ( m_oldBrush )
+        {
+            if ( ::SelectObject(GetHdc(), (HPEN) m_oldBrush) == HGDI_ERROR )
+            {
+                wxLogLastError(_T("SelectObject(old brush)"));
+            }

 
 

-  CalcBoundingBox(x, y);
+            m_oldBrush = 0;
+        }

 
 

-  long w, h;
-  GetTextExtent(text, &w, &h);
-  CalcBoundingBox((x + w), (y + h));
+        m_brush = wxNullBrush;
+    }

 }
 
 void wxDC::SetBackground(const wxBrush& brush)
 {
 }
 
 void wxDC::SetBackground(const wxBrush& brush)
 {

-  m_backgroundBrush = brush;
-
-  if (!m_backgroundBrush.Ok())
-    return;
-
-  if (m_canvas)
-  {
-    bool customColours = TRUE;
-    // If we haven't specified wxUSER_COLOURS, don't allow the panel/dialog box to
-    // change background colours from the control-panel specified colours.
-    if (m_canvas->IsKindOf(CLASSINFO(wxWindow)) && ((m_canvas->GetWindowStyleFlag() & wxUSER_COLOURS) != wxUSER_COLOURS))
-      customColours = FALSE;
-      
-    if (customColours)
-    {
-      if (m_backgroundBrush.GetStyle()==wxTRANSPARENT)
-      {
-        m_canvas->m_backgroundTransparent = TRUE;
-      }
-      else
-      {
-        m_canvas->SetBackgroundColour(m_backgroundBrush.GetColour());
-        m_canvas->m_backgroundTransparent = FALSE;
-      }
-    }
-  }
-  COLORREF new_color = m_backgroundBrush.GetColour().GetPixel() ;
-  {
-    (void)SetBkColor((HDC) m_hDC, new_color);
-  }
+    WXMICROWIN_CHECK_HDC
+
+    m_backgroundBrush = brush;
+
+    if ( m_backgroundBrush.Ok() )
+    {
+        (void)SetBkColor(GetHdc(), m_backgroundBrush.GetColour().GetPixel());
+    }

 }
 
 void wxDC::SetBackgroundMode(int mode)
 {
 }
 
 void wxDC::SetBackgroundMode(int mode)
 {

-  m_backgroundMode = mode;
+    WXMICROWIN_CHECK_HDC
+
+    m_backgroundMode = mode;

 
 

-  if (m_backgroundMode == wxTRANSPARENT)
-    ::SetBkMode((HDC) m_hDC, TRANSPARENT);
-  else
-    ::SetBkMode((HDC) m_hDC, OPAQUE);
+    // SetBackgroundColour now only refers to text background
+    // and m_backgroundMode is used there

 }
 
 void wxDC::SetLogicalFunction(int function)
 {
 }
 
 void wxDC::SetLogicalFunction(int function)
 {

-  m_logicalFunction = function;
+    WXMICROWIN_CHECK_HDC

 
 

-  SetRop((WXHDC) m_hDC);
+    m_logicalFunction = function;
+
+    SetRop(m_hDC);

 }
 
 void wxDC::SetRop(WXHDC dc)
 {
 }
 
 void wxDC::SetRop(WXHDC dc)
 {

-  if (!dc || m_logicalFunction < 0)
-    return;
-
-  int c_rop;
-  // These may be wrong
-  switch (m_logicalFunction)
-  {
-//    case wxXOR: c_rop = R2_XORPEN; break;
-    case wxXOR: c_rop = R2_NOTXORPEN; break;
-    case wxINVERT: c_rop = R2_NOT; break;
-    case wxOR_REVERSE: c_rop = R2_MERGEPENNOT; break;
-    case wxAND_REVERSE: c_rop = R2_MASKPENNOT; break;
-    case wxCLEAR: c_rop = R2_WHITE; break;
-    case wxSET: c_rop = R2_BLACK; break;
-    case wxSRC_INVERT: c_rop = R2_NOTCOPYPEN; break;
-    case wxOR_INVERT: c_rop = R2_MERGENOTPEN; break;
-    case wxAND: c_rop = R2_MASKPEN; break;
-    case wxOR: c_rop = R2_MERGEPEN; break;
-    case wxAND_INVERT: c_rop = R2_MASKNOTPEN; break;
-    case wxEQUIV:
-    case wxNAND:
-    case wxCOPY:
-    default:
-      c_rop = R2_COPYPEN; break;
-  }
-  SetROP2((HDC) dc, c_rop);
-}
-
-bool wxDC::StartDoc(const wxString& message)
-{
-  if (!this->IsKindOf(CLASSINFO(wxPrinterDC)))
-    return TRUE;
-    
-  DOCINFO docinfo;
-  docinfo.cbSize = sizeof(DOCINFO);
-  docinfo.lpszDocName = (const char *)message;
-
-  if (m_filename.IsEmpty())
-    docinfo.lpszOutput = NULL;
-  else
-    docinfo.lpszOutput = (const char *)m_filename;
-
-#if defined(__WIN95__)
-  docinfo.lpszDatatype = NULL;
-  docinfo.fwType = 0;
-#endif
+    if ( !dc || m_logicalFunction < 0 )
+        return;

 
 

-  if (!m_hDC)
-    return FALSE;
+    int rop;

 
 

-  int ret =
-#ifndef __WIN32__
-     ::StartDoc((HDC) m_hDC, &docinfo);
-#else
-#ifdef UNICODE
-     ::StartDocW((HDC) m_hDC, &docinfo);
-#else
-     ::StartDocA((HDC) m_hDC, &docinfo);
-#endif
-#endif
+    switch (m_logicalFunction)
+    {
+        case wxCLEAR:        rop = R2_BLACK;         break;
+        case wxXOR:          rop = R2_XORPEN;        break;
+        case wxINVERT:       rop = R2_NOT;           break;
+        case wxOR_REVERSE:   rop = R2_MERGEPENNOT;   break;
+        case wxAND_REVERSE:  rop = R2_MASKPENNOT;    break;
+        case wxCOPY:         rop = R2_COPYPEN;       break;
+        case wxAND:          rop = R2_MASKPEN;       break;
+        case wxAND_INVERT:   rop = R2_MASKNOTPEN;    break;
+        case wxNO_OP:        rop = R2_NOP;           break;
+        case wxNOR:          rop = R2_NOTMERGEPEN;   break;
+        case wxEQUIV:        rop = R2_NOTXORPEN;     break;
+        case wxSRC_INVERT:   rop = R2_NOTCOPYPEN;    break;
+        case wxOR_INVERT:    rop = R2_MERGENOTPEN;   break;
+        case wxNAND:         rop = R2_NOTMASKPEN;    break;
+        case wxOR:           rop = R2_MERGEPEN;      break;
+        case wxSET:          rop = R2_WHITE;         break;
+
+        default:
+           wxFAIL_MSG( wxT("unsupported logical function") );
+           return;
+    }

 
 

-#ifndef __WIN16__
-  if (ret <= 0)
-  {
-    DWORD lastError = GetLastError();
-    wxDebugMsg("wxDC::StartDoc failed with error: %d\n", lastError);
-  }
-#endif
+    SetROP2(GetHdc(), rop);
+}

 
 

-  return (ret > 0);
+bool wxDC::StartDoc(const wxString& WXUNUSED(message))
+{
+    // We might be previewing, so return true to let it continue.
+    return true;
+}
+
+void wxDC::EndDoc()
+{
+}
+
+void wxDC::StartPage()
+{

 }
 
 }
 

-void wxDC::EndDoc(void)
-{
-  if (!this->IsKindOf(CLASSINFO(wxPrinterDC)))
-    return;
-  if (m_hDC) ::EndDoc((HDC) m_hDC);
-}
+void wxDC::EndPage()
+{
+}
+
+// ---------------------------------------------------------------------------
+// text metrics
+// ---------------------------------------------------------------------------
+
+wxCoord wxDC::GetCharHeight() const
+{
+    WXMICROWIN_CHECK_HDC_RET(0)
+
+    TEXTMETRIC lpTextMetric;
+
+    GetTextMetrics(GetHdc(), &lpTextMetric);
+
+    return lpTextMetric.tmHeight;
+}
+
+wxCoord wxDC::GetCharWidth() const
+{
+    WXMICROWIN_CHECK_HDC_RET(0)
+
+    TEXTMETRIC lpTextMetric;
+
+    GetTextMetrics(GetHdc(), &lpTextMetric);
+
+    return lpTextMetric.tmAveCharWidth;
+}
+
+void wxDC::DoGetTextExtent(const wxString& string, wxCoord *x, wxCoord *y,
+                           wxCoord *descent, wxCoord *externalLeading,
+                           wxFont *font) const
+{
+#ifdef __WXMICROWIN__
+    if (!GetHDC())
+    {
+        if (x) *x = 0;
+        if (y) *y = 0;
+        if (descent) *descent = 0;
+        if (externalLeading) *externalLeading = 0;
+        return;
+    }
+#endif // __WXMICROWIN__
+
+    HFONT hfontOld;
+    if ( font )
+    {
+        wxASSERT_MSG( font->Ok(), _T("invalid font in wxDC::GetTextExtent") );
+
+        hfontOld = (HFONT)::SelectObject(GetHdc(), GetHfontOf(*font));
+    }
+    else // don't change the font
+    {
+        hfontOld = 0;
+    }
+
+    SIZE sizeRect;
+    const size_t len = string.length();
+    if ( !::GetTextExtentPoint32(GetHdc(), string, len, &sizeRect) )
+    {
+        wxLogLastError(_T("GetTextExtentPoint32()"));
+    }
+
+#if !defined(_WIN32_WCE) || (_WIN32_WCE >= 400)
+    // the result computed by GetTextExtentPoint32() may be too small as it
+    // accounts for under/overhang of the first/last character while we want
+    // just the bounding rect for this string so adjust the width as needed
+    // (using API not available in 2002 SDKs of WinCE)
+    if ( len > 0 )
+    {
+        ABC width;
+        const wxChar chFirst = *string.begin();
+        if ( ::GetCharABCWidths(GetHdc(), chFirst, chFirst, &width) )
+        {
+            if ( width.abcA < 0 )
+                sizeRect.cx -= width.abcA;

 
 

-void wxDC::StartPage(void)
-{
-  if (!this->IsKindOf(CLASSINFO(wxPrinterDC)))
-    return;
-  if (m_hDC)
-    ::StartPage((HDC) m_hDC);
-}
+            if ( len > 1 )
+            {
+                const wxChar chLast = *string.rbegin();
+                ::GetCharABCWidths(GetHdc(), chLast, chLast, &width);
+            }
+            //else: we already have the width of the last character

 
 

-void wxDC::EndPage(void)
-{
-  if (!this->IsKindOf(CLASSINFO(wxPrinterDC)))
-    return;
-  if (m_hDC)
-    ::EndPage((HDC) m_hDC);
-}
+            if ( width.abcC < 0 )
+                sizeRect.cx -= width.abcC;
+        }
+        //else: GetCharABCWidths() failed, not a TrueType font?
+    }
+#endif // !defined(_WIN32_WCE) || (_WIN32_WCE >= 400)

 
 

-long wxDC::GetCharHeight(void) const
-{
-  TEXTMETRIC lpTextMetric;
+    TEXTMETRIC tm;
+    ::GetTextMetrics(GetHdc(), &tm);

 
 

-  GetTextMetrics((HDC) m_hDC, &lpTextMetric);
+    if (x)
+        *x = sizeRect.cx;
+    if (y)
+        *y = sizeRect.cy;
+    if (descent)
+        *descent = tm.tmDescent;
+    if (externalLeading)
+        *externalLeading = tm.tmExternalLeading;

 
 

-  return YDEV2LOGREL(lpTextMetric.tmHeight);
+    if ( hfontOld )
+    {
+        ::SelectObject(GetHdc(), hfontOld);
+    }

 }
 
 }
 

-long wxDC::GetCharWidth(void) const
-{
-  TEXTMETRIC lpTextMetric;
-
-  GetTextMetrics((HDC) m_hDC, &lpTextMetric);

 
 

-  return XDEV2LOGREL(lpTextMetric.tmAveCharWidth);
-}
+// Each element of the array will be the width of the string up to and
+// including the coresoponding character in text.

 
 

-void wxDC::GetTextExtent(const wxString& string, long *x, long *y,
-                         long *descent, long *externalLeading, wxFont *theFont, bool use16bit) const
+bool wxDC::DoGetPartialTextExtents(const wxString& text, wxArrayInt& widths) const

 {
 {

-  wxFont *fontToUse = (wxFont*) theFont;
-  if (!fontToUse)
-    fontToUse = (wxFont*) &m_font;
+    static int maxLenText = -1;
+    static int maxWidth = -1;
+    int fit = 0;
+    SIZE sz = {0,0};
+    int stlen = text.length();

 
 

-  SIZE sizeRect;
-  TEXTMETRIC tm;
+    if (maxLenText == -1)
+    {
+        // Win9x and WinNT+ have different limits
+        int version = wxGetOsVersion();
+        maxLenText = version == wxOS_WINDOWS_NT ? 65535 : 8192;
+        maxWidth =   version == wxOS_WINDOWS_NT ? INT_MAX : 32767;
+    }

 
 

-  GetTextExtentPoint((HDC) m_hDC, (char *)(const char *) string, strlen((char *)(const char *) string), &sizeRect);
-  GetTextMetrics((HDC) m_hDC, &tm);
+    widths.Empty();
+    widths.Add(0, stlen);  // fill the array with zeros
+    if (stlen == 0)
+        return true;
+
+    if (!::GetTextExtentExPoint(GetHdc(),
+                                text.c_str(),           // string to check
+                                wxMin(stlen, maxLenText),
+                                maxWidth,
+                                &fit,                   // [out] count of chars
+                                                        // that will fit
+                                &widths[0],             // array to fill
+                                &sz))
+    {
+        // API failed
+        wxLogLastError(wxT("GetTextExtentExPoint"));
+        return false;
+    }

 
 

-  if (x) *x = XDEV2LOGREL(sizeRect.cx);
-  if (y) *y = YDEV2LOGREL(sizeRect.cy);
-  if (descent) *descent = tm.tmDescent;
-  if (externalLeading) *externalLeading = tm.tmExternalLeading;
+    return true;

 }
 
 }
 

-void wxDC::SetMapMode(int mode)
-{
-  m_mappingMode = mode;

 
 

-  int pixel_width = 0;
-  int pixel_height = 0;
-  int mm_width = 0;
-  int mm_height = 0;

 
 

-  pixel_width = GetDeviceCaps((HDC) m_hDC, HORZRES);
-  pixel_height = GetDeviceCaps((HDC) m_hDC, VERTRES);
-  mm_width = GetDeviceCaps((HDC) m_hDC, HORZSIZE);
-  mm_height = GetDeviceCaps((HDC) m_hDC, VERTSIZE);

 
 

-  if ((pixel_width == 0) || (pixel_height == 0) || (mm_width == 0) || (mm_height == 0))
-  {
-    return;
-  }
+void wxDC::SetMapMode(int mode)
+{
+    WXMICROWIN_CHECK_HDC

 
 

-  double mm2pixelsX = pixel_width/mm_width;
-  double mm2pixelsY = pixel_height/mm_height;
+    m_mappingMode = mode;

 
 

-  switch (mode)
-  {
-    case MM_TWIPS:
-    {
-      m_logicalScaleX = (twips2mm * mm2pixelsX);
-      m_logicalScaleY = (twips2mm * mm2pixelsY);
-      break;
-    }
-    case MM_POINTS:
-    {
-      m_logicalScaleX = (pt2mm * mm2pixelsX);
-      m_logicalScaleY = (pt2mm * mm2pixelsY);
-      break;
-    }
-    case MM_METRIC:
+    if ( mode == wxMM_TEXT )

     {
     {

-      m_logicalScaleX = mm2pixelsX;
-      m_logicalScaleY = mm2pixelsY;
-      break;
+        m_logicalScaleX =
+        m_logicalScaleY = 1.0;

     }
     }

-    case MM_LOMETRIC:
+    else // need to do some calculations

     {
     {

-      m_logicalScaleX = (mm2pixelsX/10.0);
-      m_logicalScaleY = (mm2pixelsY/10.0);
-      break;
-    }
-    default:
-    case MM_TEXT:
-    {
-      m_logicalScaleX = 1.0;
-      m_logicalScaleY = 1.0;
-      break;
+        int pixel_width = ::GetDeviceCaps(GetHdc(), HORZRES),
+            pixel_height = ::GetDeviceCaps(GetHdc(), VERTRES),
+            mm_width = ::GetDeviceCaps(GetHdc(), HORZSIZE),
+            mm_height = ::GetDeviceCaps(GetHdc(), VERTSIZE);
+
+        if ( (mm_width == 0) || (mm_height == 0) )
+        {
+            // we can't calculate mm2pixels[XY] then!
+            return;
+        }
+
+        double mm2pixelsX = (double)pixel_width / mm_width,
+               mm2pixelsY = (double)pixel_height / mm_height;
+
+        switch (mode)
+        {
+            case wxMM_TWIPS:
+                m_logicalScaleX = twips2mm * mm2pixelsX;
+                m_logicalScaleY = twips2mm * mm2pixelsY;
+                break;
+
+            case wxMM_POINTS:
+                m_logicalScaleX = pt2mm * mm2pixelsX;
+                m_logicalScaleY = pt2mm * mm2pixelsY;
+                break;
+
+            case wxMM_METRIC:
+                m_logicalScaleX = mm2pixelsX;
+                m_logicalScaleY = mm2pixelsY;
+                break;
+
+            case wxMM_LOMETRIC:
+                m_logicalScaleX = mm2pixelsX / 10.0;
+                m_logicalScaleY = mm2pixelsY / 10.0;
+                break;
+
+            default:
+                wxFAIL_MSG( _T("unknown mapping mode in SetMapMode") );
+        }

     }
     }

-  }

 
 

-  if (::GetMapMode((HDC) m_hDC) != MM_ANISOTROPIC)
-    ::SetMapMode((HDC) m_hDC, MM_ANISOTROPIC);
+    // 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((HDC) m_hDC, VIEWPORT_EXTENT, VIEWPORT_EXTENT, NULL);
-  m_windowExtX = (int)MS_XDEV2LOGREL(VIEWPORT_EXTENT);
-  m_windowExtY = (int)MS_YDEV2LOGREL(VIEWPORT_EXTENT);
-  ::SetWindowExtEx((HDC) m_hDC, m_windowExtX, m_windowExtY, NULL);
-  ::SetViewportOrgEx((HDC) m_hDC, (int)m_deviceOriginX, (int)m_deviceOriginY, NULL);
-  ::SetWindowOrgEx((HDC) m_hDC, (int)m_logicalOriginX, (int)m_logicalOriginY, NULL);
+    ::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::SetUserScale(double x, double y)
 {
 }
 
 void wxDC::SetUserScale(double x, double y)
 {

-  m_userScaleX = x;
-  m_userScaleY = y;
+    WXMICROWIN_CHECK_HDC

 
 

-  SetMapMode(m_mappingMode);
-}
+    if ( x == m_userScaleX && y == m_userScaleY )
+        return;

 
 

-void wxDC::SetAxisOrientation(bool xLeftRight, bool yBottomUp)
-{
-  m_signX = xLeftRight ? 1 : -1;
-  m_signY = yBottomUp ? -1 : 1;
+    m_userScaleX = x;
+    m_userScaleY = y;

 
 

-  SetMapMode(m_mappingMode);
+    this->SetMapMode(m_mappingMode);

 }
 
 }
 

-void wxDC::SetSystemScale(double x, double y)
+void wxDC::SetAxisOrientation(bool WXUNUSED_IN_WINCE(xLeftRight),
+                              bool WXUNUSED_IN_WINCE(yBottomUp))

 {
 {

-  m_systemScaleX = x;
-  m_systemScaleY = y;
+    WXMICROWIN_CHECK_HDC

 
 

-  SetMapMode(m_mappingMode);
-}
+#ifndef __WXWINCE__
+    int signX = xLeftRight ? 1 : -1,
+        signY = yBottomUp ? -1 : 1;

 
 

-void wxDC::SetLogicalOrigin(long x, long y)
-{
-  m_logicalOriginX = x;
-  m_logicalOriginY = y;
+    if ( signX != m_signX || signY != m_signY )
+    {
+        m_signX = signX;
+        m_signY = signY;

 
 

-  ::SetWindowOrgEx((HDC) m_hDC, (int)m_logicalOriginX, (int)m_logicalOriginY, NULL);
+        SetMapMode(m_mappingMode);
+    }
+#endif

 }
 
 }
 

-void wxDC::SetDeviceOrigin(long x, long y)
+void wxDC::SetSystemScale(double x, double y)

 {
 {

-  m_deviceOriginX = x;
-  m_deviceOriginY = y;
+    WXMICROWIN_CHECK_HDC

 
 

-  ::SetViewportOrgEx((HDC) m_hDC, (int)m_deviceOriginX, (int)m_deviceOriginY, NULL);
-}
+    if ( x == m_scaleX && y == m_scaleY )
+        return;

 
 

-long wxDC::DeviceToLogicalX(long x) const
-{
-    return (long) (((x) - m_deviceOriginX)/(m_logicalScaleX*m_userScaleX*m_signX*m_systemScaleX) - m_logicalOriginX) ;
-}
+    m_scaleX = x;
+    m_scaleY = y;

 
 

-long wxDC::DeviceToLogicalXRel(long x) const
-{
-    return (long) ((x)/(m_logicalScaleX*m_userScaleX*m_signX*m_systemScaleX)) ;
+#ifndef __WXWINCE__
+    SetMapMode(m_mappingMode);
+#endif

 }
 
 }
 

-long wxDC::DeviceToLogicalY(long y) const
+void wxDC::SetLogicalOrigin(wxCoord x, wxCoord y)

 {
 {

-    return (long) (((y) - m_deviceOriginY)/(m_logicalScaleY*m_userScaleY*m_signY*m_systemScaleY) - m_logicalOriginY) ;
-}
+    WXMICROWIN_CHECK_HDC

 
 

-long wxDC::DeviceToLogicalYRel(long y) const
-{
-    return (long) ((y)/(m_logicalScaleY*m_userScaleY*m_signY*m_systemScaleY)) ;
-}
+    if ( x == m_logicalOriginX && y == m_logicalOriginY )
+        return;

 
 

-long wxDC::LogicalToDeviceX(long x) const
-{
-    return (long) (floor((x) - m_logicalOriginX)*m_logicalScaleX*m_userScaleX*m_signX*m_systemScaleX + m_deviceOriginX) ;
-}
+    m_logicalOriginX = x;
+    m_logicalOriginY = y;

 
 

-long wxDC::LogicalToDeviceXRel(long x) const
-{
-    return (long) (floor(x)*m_logicalScaleX*m_userScaleX*m_signX*m_systemScaleX) ;
+#ifndef __WXWINCE__
+    ::SetWindowOrgEx(GetHdc(), (int)m_logicalOriginX, (int)m_logicalOriginY, NULL);
+#endif

 }
 
 }
 

-long wxDC::LogicalToDeviceY(long y) const
+void wxDC::SetDeviceOrigin(wxCoord x, wxCoord y)

 {
 {

-    return (long) (floor((y) - m_logicalOriginY)*m_logicalScaleY*m_userScaleY*m_signY*m_systemScaleY + m_deviceOriginY);
-}
+    WXMICROWIN_CHECK_HDC

 
 

-long wxDC::LogicalToDeviceYRel(long y) const
-{
-    return (long) (floor(y)*m_logicalScaleY*m_userScaleY*m_signY*m_systemScaleY) ;
+    if ( x == m_deviceOriginX && y == m_deviceOriginY )
+        return;
+
+    m_deviceOriginX = x;
+    m_deviceOriginY = y;
+
+    ::SetViewportOrgEx(GetHdc(), (int)m_deviceOriginX, (int)m_deviceOriginY, NULL);

 }
 
 }
 

-// This group of functions may not do any conversion
-// if m_scaleGDI is TRUE, since the HDC does the
-// conversion automatically.
+// ---------------------------------------------------------------------------
+// coordinates transformations
+// ---------------------------------------------------------------------------

 
 

-long wxDC::ImplDeviceToLogicalX(long x) const
+wxCoord wxDCBase::DeviceToLogicalX(wxCoord x) const

 {
 {

-//  return (m_scaleGDI ?  x :  DeviceToLogicalX(x));
-    return x;
+    return DeviceToLogicalXRel(x - m_deviceOriginX)*m_signX + m_logicalOriginX;

 }
 
 }
 

-long wxDC::ImplDeviceToLogicalY(long y) const
+wxCoord wxDCBase::DeviceToLogicalXRel(wxCoord x) const

 {
 {

-//  return (m_scaleGDI ?  y :  DeviceToLogicalY(y));
-    return y;
+    // axis orientation is not taken into account for conversion of a distance
+    return (wxCoord)(x / (m_logicalScaleX*m_userScaleX*m_scaleX));

 }
 
 }
 

-long wxDC::ImplDeviceToLogicalXRel(long x) const
+wxCoord wxDCBase::DeviceToLogicalY(wxCoord y) const

 {
 {

-//  return (m_scaleGDI ?  x :  DeviceToLogicalXRel(x));
-    return x;
+    return DeviceToLogicalYRel(y - m_deviceOriginY)*m_signY + m_logicalOriginY;

 }
 
 }
 

-long wxDC::ImplDeviceToLogicalYRel(long y) const
+wxCoord wxDCBase::DeviceToLogicalYRel(wxCoord y) const

 {
 {

-//  return (m_scaleGDI ?  y :  DeviceToLogicalYRel(y));
-    return y;
+    // axis orientation is not taken into account for conversion of a distance
+    return (wxCoord)( y / (m_logicalScaleY*m_userScaleY*m_scaleY));

 }
 
 }
 

-long wxDC::ImplLogicalToDeviceX(long x) const
+wxCoord wxDCBase::LogicalToDeviceX(wxCoord x) const

 {
 {

-//  return (m_scaleGDI ?  (floor(double(x))) :  LogicalToDeviceX(x));
-    return x;
+    return LogicalToDeviceXRel(x - m_logicalOriginX)*m_signX + m_deviceOriginX;

 }
 
 }
 

-long wxDC::ImplLogicalToDeviceY(long y) const
+wxCoord wxDCBase::LogicalToDeviceXRel(wxCoord x) const

 {
 {

-//  return (m_scaleGDI ?  (floor(double(y))) :  LogicalToDeviceY(y));
-    return y;
+    // axis orientation is not taken into account for conversion of a distance
+    return (wxCoord) (x*m_logicalScaleX*m_userScaleX*m_scaleX);

 }
 
 }
 

-long wxDC::ImplLogicalToDeviceXRel(long x) const
+wxCoord wxDCBase::LogicalToDeviceY(wxCoord y) const

 {
 {

-//  return (m_scaleGDI ?  (floor(double(x))) :  LogicalToDeviceXRel(x));
-    return x;
+    return LogicalToDeviceYRel(y - m_logicalOriginY)*m_signY + m_deviceOriginY;

 }
 
 }
 

-long wxDC::ImplLogicalToDeviceYRel(long y) const
+wxCoord wxDCBase::LogicalToDeviceYRel(wxCoord y) const

 {
 {

-//  return (m_scaleGDI ?  (floor(double(y))) :  LogicalToDeviceYRel(y));
-    return y;
+    // axis orientation is not taken into account for conversion of a distance
+    return (wxCoord) (y*m_logicalScaleY*m_userScaleY*m_scaleY);

 }
 
 }
 

-bool wxDC::Blit(long xdest, long ydest, long width, long height,
-                wxDC *source, long xsrc, long ysrc, int rop, bool useMask)
+// ---------------------------------------------------------------------------
+// bit blit
+// ---------------------------------------------------------------------------
+
+bool wxDC::DoBlit(wxCoord xdest, wxCoord ydest,
+                  wxCoord width, wxCoord height,
+                  wxDC *source, wxCoord xsrc, wxCoord ysrc,
+                  int rop, bool useMask,
+                  wxCoord xsrcMask, wxCoord ysrcMask)

 {
 {

-  long xdest1 = xdest;
-  long ydest1 = ydest;
-  long xsrc1 = xsrc;
-  long ysrc1 = ysrc;
+    wxCHECK_MSG( source, false, _T("wxDC::Blit(): NULL wxDC pointer") );
+
+    WXMICROWIN_CHECK_HDC_RET(false)
+
+    // 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())) )
+    {
+        if ( AlphaBlt(GetHdc(), xdest, ydest, width, height,
+                      xsrc, ysrc, GetHdcOf(*source), bmpSrc) )
+            return true;
+    }
+
+    wxMask *mask = NULL;
+    if ( useMask )
+    {
+        mask = bmpSrc.GetMask();

 
 

-  // Chris Breeze 18/5/98: use text foreground/background colours
-  // when blitting from 1-bit bitmaps
-  COLORREF old_textground = ::GetTextColor((HDC)m_hDC);
-  COLORREF old_background = ::GetBkColor((HDC)m_hDC);
-  if (m_textForegroundColour.Ok())
-  {
-    ::SetTextColor((HDC) m_hDC, m_textForegroundColour.GetPixel() ) ;
-  }
-  if (m_textBackgroundColour.Ok())
-  {
-    ::SetBkColor((HDC) m_hDC, m_textBackgroundColour.GetPixel() ) ;
-  }
+        if ( !(bmpSrc.Ok() && mask && mask->GetMaskBitmap()) )
+        {
+            // don't give assert here because this would break existing
+            // programs - just silently ignore useMask parameter
+            useMask = false;
+        }
+    }

 
 

-  DWORD dwRop = rop == wxCOPY ? SRCCOPY :
-                rop == wxCLEAR ? WHITENESS :
-                rop == wxSET ? BLACKNESS :
-                rop == wxINVERT ? DSTINVERT :
-                rop == wxAND ? MERGECOPY :
-                rop == wxOR ? MERGEPAINT :
-                rop == wxSRC_INVERT ? NOTSRCCOPY :
-                rop == wxXOR ? SRCINVERT :
-                rop == wxOR_REVERSE ? MERGEPAINT :
-                rop == wxAND_REVERSE ? SRCERASE :
-                rop == wxSRC_OR ? SRCPAINT :
-                rop == wxSRC_AND ? SRCAND :
-                SRCCOPY;
+    if (xsrcMask == -1 && ysrcMask == -1)
+    {
+        xsrcMask = xsrc; ysrcMask = ysrc;
+    }

 
 

-  bool success = TRUE;
-  if (useMask && source->m_selectedBitmap.Ok() && source->m_selectedBitmap.GetMask())
-  {
+    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() );
+    }

 
 

-#if 0 // __WIN32__
-    // Not implemented under Win95 (or maybe a specific device?)
-    if (MaskBlt((HDC) m_hDC, xdest1, ydest1, (int)width, (int)height,
-            (HDC) source->m_hDC, xsrc1, ysrc1, (HBITMAP) source->m_selectedBitmap.GetMask()->GetMaskBitmap(),
-            0, 0, 0xAACC0020))
+    DWORD dwRop;
+    switch (rop)

     {
     {

-        // Success
+        case wxXOR:          dwRop = SRCINVERT;        break;
+        case wxINVERT:       dwRop = DSTINVERT;        break;
+        case wxOR_REVERSE:   dwRop = 0x00DD0228;       break;
+        case wxAND_REVERSE:  dwRop = SRCERASE;         break;
+        case wxCLEAR:        dwRop = BLACKNESS;        break;
+        case wxSET:          dwRop = WHITENESS;        break;
+        case wxOR_INVERT:    dwRop = MERGEPAINT;       break;
+        case wxAND:          dwRop = SRCAND;           break;
+        case wxOR:           dwRop = SRCPAINT;         break;
+        case wxEQUIV:        dwRop = 0x00990066;       break;
+        case wxNAND:         dwRop = 0x007700E6;       break;
+        case wxAND_INVERT:   dwRop = 0x00220326;       break;
+        case wxCOPY:         dwRop = SRCCOPY;          break;
+        case wxNO_OP:        dwRop = DSTCOPY;          break;
+        case wxSRC_INVERT:   dwRop = NOTSRCCOPY;       break;
+        case wxNOR:          dwRop = NOTSRCCOPY;       break;
+        default:
+           wxFAIL_MSG( wxT("unsupported logical function") );
+           return false;

     }
     }

-    else
-#endif
+
+    bool success = false;
+
+    if (useMask)

     {
     {

-        // Old code
-#if 0
-        HDC dc_mask = CreateCompatibleDC((HDC) source->m_hDC);
-        ::SelectObject(dc_mask, (HBITMAP) source->m_selectedBitmap.GetMask()->GetMaskBitmap());
-        success = (BitBlt((HDC) m_hDC, xdest1, ydest1, (int)width, (int)height,
-                     dc_mask, xsrc1, ysrc1, 0x00220326 /* NOTSRCAND */) != 0);
-        success = (BitBlt((HDC) m_hDC, xdest1, ydest1, (int)width, (int)height,
-                     (HDC) source->m_hDC, xsrc1, ysrc1, SRCPAINT) != 0);
-        ::SelectObject(dc_mask, 0);
-        ::DeleteDC(dc_mask);
+#ifdef __WIN32__
+        // we want the part of the image corresponding to the mask to be
+        // transparent, so use "DSTCOPY" ROP for the mask points (the usual
+        // meaning of fg and bg is inverted which corresponds to wxWin notion
+        // of the mask which is also contrary to the Windows one)
+
+        // On some systems, MaskBlt succeeds yet is much much slower
+        // than the wxWidgets fall-back implementation. So we need
+        // to be able to switch this on and off at runtime.
+#if wxUSE_SYSTEM_OPTIONS
+        if (wxSystemOptions::GetOptionInt(wxT("no-maskblt")) == 0)

 #endif
 #endif

-        // New code from Chris Breeze, 15/7/98
-        // Blit bitmap with mask
-
-        if (IsKindOf(CLASSINFO(wxPrinterDC)))

         {
         {

-            // If we are printing source colours are screen colours
-            // not printer colours and so we need copy the bitmap
-            // pixel by pixel.
-            RECT rect;
-            HDC dc_mask = ::CreateCompatibleDC((HDC) source->m_hDC);
-            HDC dc_src = (HDC) source->m_hDC;
-
-            ::SelectObject(dc_mask, (HBITMAP) source->m_selectedBitmap.GetMask()->GetMaskBitmap());
-            for (int x = 0; x < width; x++)
-            {
-                for (int y = 0; y < height; y++)
-                {
-                    COLORREF cref = ::GetPixel(dc_mask, x, y);
-                    if (cref)
-                    {
-                        HBRUSH brush = ::CreateSolidBrush(::GetPixel(dc_src, x, y));
-                        rect.left = xdest1 + x; rect.right = rect.left + 1;
-                        rect.top = ydest1 + y;  rect.bottom = rect.top + 1;
-                        ::FillRect((HDC) m_hDC, &rect, brush);
-                        ::DeleteObject(brush);
-                    }
-                }
-            }
-            ::SelectObject(dc_mask, 0);
-            ::DeleteDC(dc_mask);
+           success = ::MaskBlt
+                       (
+                            GetHdc(),
+                            xdest, ydest, width, height,
+                            GetHdcOf(*source),
+                            xsrc, ysrc,
+                            (HBITMAP)mask->GetMaskBitmap(),
+                            xsrcMask, ysrcMask,
+                            MAKEROP4(dwRop, DSTCOPY)
+                        ) != 0;

         }
         }

-        else
+
+        if ( !success )
+#endif // Win32

         {
         {

+            // Blit bitmap with mask
+            HDC dc_mask ;
+            HDC  dc_buffer ;
+            HBITMAP buffer_bmap ;
+
+#if wxUSE_DC_CACHEING
+            // create a temp buffer bitmap and DCs to access it and the mask
+            wxDCCacheEntry* dcCacheEntry1 = FindDCInCache(NULL, source->GetHDC());
+            dc_mask = (HDC) dcCacheEntry1->m_dc;
+
+            wxDCCacheEntry* dcCacheEntry2 = FindDCInCache(dcCacheEntry1, GetHDC());
+            dc_buffer = (HDC) dcCacheEntry2->m_dc;
+
+            wxDCCacheEntry* bitmapCacheEntry = FindBitmapInCache(GetHDC(),
+                width, height);
+
+            buffer_bmap = (HBITMAP) bitmapCacheEntry->m_bitmap;
+#else // !wxUSE_DC_CACHEING

             // create a temp buffer bitmap and DCs to access it and the mask
             // create a temp buffer bitmap and DCs to access it and the mask

-            HDC dc_mask = ::CreateCompatibleDC((HDC) source->m_hDC);
-            HDC dc_buffer = ::CreateCompatibleDC((HDC) m_hDC);
-            HBITMAP buffer_bmap = ::CreateCompatibleBitmap((HDC) m_hDC, width, height);
-            ::SelectObject(dc_mask, (HBITMAP) source->m_selectedBitmap.GetMask()->GetMaskBitmap());
-            ::SelectObject(dc_buffer, buffer_bmap);
+            dc_mask = ::CreateCompatibleDC(GetHdcOf(*source));
+            dc_buffer = ::CreateCompatibleDC(GetHdc());
+            buffer_bmap = ::CreateCompatibleBitmap(GetHdc(), width, height);
+#endif // wxUSE_DC_CACHEING/!wxUSE_DC_CACHEING
+            HGDIOBJ hOldMaskBitmap = ::SelectObject(dc_mask, (HBITMAP) mask->GetMaskBitmap());
+            HGDIOBJ hOldBufferBitmap = ::SelectObject(dc_buffer, buffer_bmap);

 
             // copy dest to buffer
 
             // copy dest to buffer

-            ::BitBlt(dc_buffer, 0, 0, (int)width, (int)height,
-                (HDC) m_hDC, xdest1, ydest1, SRCCOPY);
+            if ( !::BitBlt(dc_buffer, 0, 0, (int)width, (int)height,
+                           GetHdc(), xdest, ydest, SRCCOPY) )
+            {
+                wxLogLastError(wxT("BitBlt"));
+            }

 
             // copy src to buffer using selected raster op
 
             // copy src to buffer using selected raster op

-            ::BitBlt(dc_buffer, 0, 0, (int)width, (int)height,
-                (HDC) source->m_hDC, xsrc1, ysrc1, dwRop);
+            if ( !::BitBlt(dc_buffer, 0, 0, (int)width, (int)height,
+                           GetHdcOf(*source), xsrc, ysrc, dwRop) )
+            {
+                wxLogLastError(wxT("BitBlt"));
+            }

 
             // set masked area in buffer to BLACK (pixel value 0)
 
             // set masked area in buffer to BLACK (pixel value 0)

-            COLORREF prevBkCol = ::SetBkColor((HDC) m_hDC, RGB(255, 255, 255));
-            COLORREF prevCol = ::SetTextColor((HDC) m_hDC, RGB(0, 0, 0));
-            ::BitBlt(dc_buffer, 0, 0, (int)width, (int)height,
-                dc_mask, xsrc1, ysrc1, SRCAND);
+            COLORREF prevBkCol = ::SetBkColor(GetHdc(), RGB(255, 255, 255));
+            COLORREF prevCol = ::SetTextColor(GetHdc(), RGB(0, 0, 0));
+            if ( !::BitBlt(dc_buffer, 0, 0, (int)width, (int)height,
+                           dc_mask, xsrcMask, ysrcMask, SRCAND) )
+            {
+                wxLogLastError(wxT("BitBlt"));
+            }

 
             // set unmasked area in dest to BLACK
 
             // set unmasked area in dest to BLACK

-            ::SetBkColor((HDC) m_hDC, RGB(0, 0, 0));
-            ::SetTextColor((HDC) m_hDC, RGB(255, 255, 255));
-            ::BitBlt((HDC) m_hDC, xdest1, ydest1, (int)width, (int)height,
-                dc_mask, xsrc1, ysrc1, SRCAND);
-            ::SetBkColor((HDC) m_hDC, prevBkCol);   // restore colours to original values
-            ::SetTextColor((HDC) m_hDC, prevCol);
+            ::SetBkColor(GetHdc(), RGB(0, 0, 0));
+            ::SetTextColor(GetHdc(), RGB(255, 255, 255));
+            if ( !::BitBlt(GetHdc(), xdest, ydest, (int)width, (int)height,
+                           dc_mask, xsrcMask, ysrcMask, SRCAND) )
+            {
+                wxLogLastError(wxT("BitBlt"));
+            }
+            ::SetBkColor(GetHdc(), prevBkCol);   // restore colours to original values
+            ::SetTextColor(GetHdc(), prevCol);

 
             // OR buffer to dest
 
             // OR buffer to dest

-            success = (::BitBlt((HDC) m_hDC, xdest1, ydest1, (int)width, (int)height,
-                dc_buffer, 0, 0, SRCPAINT) != 0);
+            success = ::BitBlt(GetHdc(), xdest, ydest,
+                               (int)width, (int)height,
+                               dc_buffer, 0, 0, SRCPAINT) != 0;
+            if ( !success )
+            {
+                wxLogLastError(wxT("BitBlt"));
+            }

 
             // tidy up temporary DCs and bitmap
 
             // tidy up temporary DCs and bitmap

-            ::SelectObject(dc_mask, 0);
-            ::DeleteDC(dc_mask);
-            ::SelectObject(dc_buffer, 0);
-            ::DeleteDC(dc_buffer);
-            ::DeleteObject(buffer_bmap);
+            ::SelectObject(dc_mask, hOldMaskBitmap);
+            ::SelectObject(dc_buffer, hOldBufferBitmap);
+
+#if !wxUSE_DC_CACHEING
+            {
+                ::DeleteDC(dc_mask);
+                ::DeleteDC(dc_buffer);
+                ::DeleteObject(buffer_bmap);
+            }
+#endif

         }
     }
         }
     }

-  }
-  else
-  {
-    if (IsKindOf(CLASSINFO(wxPrinterDC)))
-    {
-      // If we are printing, source colours are screen colours
-      // not printer colours and so we need copy the bitmap
-      // pixel by pixel.
-      HDC dc_src = (HDC) source->m_hDC;
-      RECT rect;
-      for (int x = 0; x < width; x++)
-      {
-        for (int y = 0; y < height; y++)
+    else // no mask, just BitBlt() it
+    {
+        // if we already have a DIB, draw it using StretchDIBits(), otherwise
+        // use StretchBlt() if available and finally fall back to BitBlt()
+
+        // FIXME: use appropriate WinCE functions
+#ifndef __WXWINCE__
+        const int caps = ::GetDeviceCaps(GetHdc(), RASTERCAPS);
+        if ( bmpSrc.Ok() && (caps & RC_STRETCHDIB) )
+        {
+            DIBSECTION ds;
+            wxZeroMemory(ds);
+
+            if ( ::GetObject(GetHbitmapOf(bmpSrc),
+                             sizeof(ds),
+                             &ds) == sizeof(ds) )
+            {
+                StretchBltModeChanger changeMode(GetHdc(), COLORONCOLOR);
+
+                // Figure out what co-ordinate system we're supposed to specify
+                // ysrc in.
+                const LONG hDIB = ds.dsBmih.biHeight;
+                if ( hDIB > 0 )
+                {
+                    // reflect ysrc
+                    ysrc = hDIB - (ysrc + height);
+                }
+
+                if ( ::StretchDIBits(GetHdc(),
+                                     xdest, ydest,
+                                     width, height,
+                                     xsrc, ysrc,
+                                     width, height,
+                                     ds.dsBm.bmBits,
+                                     (LPBITMAPINFO)&ds.dsBmih,
+                                     DIB_RGB_COLORS,
+                                     dwRop
+                                     ) == (int)GDI_ERROR )
+                {
+                    // On Win9x this API fails most (all?) of the time, so
+                    // logging it becomes quite distracting.  Since it falls
+                    // back to the code below this is not really serious, so
+                    // don't log it.
+                    //wxLogLastError(wxT("StretchDIBits"));
+                }
+                else
+                {
+                    success = true;
+                }
+            }
+        }
+
+        if ( !success && (caps & RC_STRETCHBLT) )
+#endif
+        // __WXWINCE__

         {
         {

-          HBRUSH brush = ::CreateSolidBrush(::GetPixel(dc_src, x, y));
-          rect.left = xdest1 + x;   rect.right = rect.left + 1;
-          rect.top = ydest1 + y;    rect.bottom = rect.top + 1;
-          ::FillRect((HDC) m_hDC, &rect, brush);
-          ::DeleteObject(brush);
+#ifndef __WXWINCE__
+            StretchBltModeChanger changeMode(GetHdc(), COLORONCOLOR);
+#endif
+
+            if ( !::StretchBlt
+                    (
+                        GetHdc(),
+                        xdest, ydest, width, height,
+                        GetHdcOf(*source),
+                        xsrc, ysrc, width, height,
+                        dwRop
+                    ) )
+            {
+                wxLogLastError(_T("StretchBlt"));
+            }
+            else
+            {
+                success = true;
+            }
+        }
+
+        if ( !success )
+        {
+            if ( !::BitBlt
+                    (
+                        GetHdc(),
+                        xdest, ydest,
+                        (int)width, (int)height,
+                        GetHdcOf(*source),
+                        xsrc, ysrc,
+                        dwRop
+                    ) )
+            {
+                wxLogLastError(_T("BitBlt"));
+            }
+            else
+            {
+                success = true;
+            }

         }
         }

-      }
-    }
-    else
-    {
-      success = (BitBlt((HDC) m_hDC, xdest1, ydest1, (int)width, (int)height, (HDC) source->m_hDC,
-                            xsrc1, ysrc1, dwRop) != 0);

     }
     }

-  }
-  ::SetTextColor((HDC)m_hDC, old_textground);
-  ::SetBkColor((HDC)m_hDC, old_background);

 
 

-  return success;
-}
+    ::SetTextColor(GetHdc(), old_textground);
+    ::SetBkColor(GetHdc(), old_background);

 
 

-void wxDC::GetSize(int* width, int* height) const
-{
-  long w=::GetDeviceCaps((HDC) m_hDC,HORZRES);
-  long h=::GetDeviceCaps((HDC) m_hDC,VERTRES);
-  *width = w;
-  *height = h;
+    return success;

 }
 
 }
 

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

 {
 {

-  long w=::GetDeviceCaps((HDC) m_hDC,HORZSIZE);
-  long h=::GetDeviceCaps((HDC) m_hDC,VERTSIZE);
-  *width = w;
-  *height = h;
+    WXMICROWIN_CHECK_HDC
+
+    if ( width )
+        *width = ::GetDeviceCaps(GetHdc(), HORZRES);
+    if ( height )
+        *height = ::GetDeviceCaps(GetHdc(), VERTRES);

 }
 
 }
 

-void wxDC::DrawPolygon(wxList *list, long xoffset, long yoffset,int fillStyle)
+void wxDC::DoGetSizeMM(int *w, int *h) const

 {
 {

-  int n = list->Number();
-  wxPoint *points = new wxPoint[n];
+    WXMICROWIN_CHECK_HDC

 
 

-  int i = 0;
-  for(wxNode *node = list->First(); node; node = node->Next()) {
-    wxPoint *point = (wxPoint *)node->Data();
-    points[i].x = point->x;
-    points[i++].y = point->y;
-  }
-  DrawPolygon(n, points, xoffset, yoffset,fillStyle);
-  delete[] points;
-}
+    // if we implement it in terms of DoGetSize() instead of directly using the
+    // results returned by GetDeviceCaps(HORZ/VERTSIZE) as was done before, it
+    // will also work for wxWindowDC and wxClientDC even though their size is
+    // not the same as the total size of the screen
+    int wPixels, hPixels;
+    DoGetSize(&wPixels, &hPixels);

 
 

-void wxDC::DrawLines(wxList *list, long xoffset, long yoffset)
-{
-  int n = list->Number();
-  wxPoint *points = new wxPoint[n];
+    if ( w )
+    {
+        int wTotal = ::GetDeviceCaps(GetHdc(), HORZRES);

 
 

-  int i = 0;
-  for(wxNode *node = list->First(); node; node = node->Next()) {
-    wxPoint *point = (wxPoint *)node->Data();
-    points[i].x = point->x;
-    points[i++].y = point->y;
-  }
-  DrawLines(n, points, xoffset, yoffset);
-  delete []points;
-}
+        wxCHECK_RET( wTotal, _T("0 width device?") );

 
 

-void wxDC::SetTextForeground(const wxColour& colour)
-{
-    m_textForegroundColour = colour;
+        *w = (wPixels * ::GetDeviceCaps(GetHdc(), HORZSIZE)) / wTotal;
+    }
+
+    if ( h )
+    {
+        int hTotal = ::GetDeviceCaps(GetHdc(), VERTRES);
+
+        wxCHECK_RET( hTotal, _T("0 height device?") );
+
+        *h = (hPixels * ::GetDeviceCaps(GetHdc(), VERTSIZE)) / hTotal;
+    }

 }
 
 }
 

-void wxDC::SetTextBackground(const wxColour& colour)
+wxSize wxDC::GetPPI() const

 {
 {

-    m_textBackgroundColour = colour;
+    WXMICROWIN_CHECK_HDC_RET(wxSize(0,0))
+
+    int x = ::GetDeviceCaps(GetHdc(), LOGPIXELSX);
+    int y = ::GetDeviceCaps(GetHdc(), LOGPIXELSY);
+
+    return wxSize(x, y);

 }
 
 }
 

-// For use by wxWindows only, unless custom units are required.
+// For use by wxWidgets only, unless custom units are required.

 void wxDC::SetLogicalScale(double x, double y)
 {
 void wxDC::SetLogicalScale(double x, double y)
 {

-  m_logicalScaleX = x;
-  m_logicalScaleY = y;
-}
+    WXMICROWIN_CHECK_HDC

 
 

-void wxDC::CalcBoundingBox(long x, long y)
-{
-  if (x < m_minX) m_minX = x;
-  if (y < m_minY) m_minY = y;
-  if (x > m_maxX) m_maxX = x;
-  if (y > m_maxY) m_maxY = y;
+    m_logicalScaleX = x;
+    m_logicalScaleY = y;

 }
 
 }
 

-void wxDC::GetClippingBox(long *x,long *y,long *w,long *h) const
+// ----------------------------------------------------------------------------
+// DC caching
+// ----------------------------------------------------------------------------
+
+#if wxUSE_DC_CACHEING
+
+/*
+ * This implementation is a bit ugly and uses the old-fashioned wxList class, so I will
+ * improve it in due course, either using arrays, or simply storing pointers to one
+ * entry for the bitmap, and two for the DCs. -- JACS
+ */
+
+wxList wxDC::sm_bitmapCache;
+wxList wxDC::sm_dcCache;
+
+wxDCCacheEntry::wxDCCacheEntry(WXHBITMAP hBitmap, int w, int h, int depth)

 {
 {

-  if (m_clipping)
-  {
-    *x = m_clipX1 ;
-    *y = m_clipY1 ;
-    *w = (m_clipX2 - m_clipX1) ;
-    *h = (m_clipY2 - m_clipY1) ;
-  }
-  else
-   *x = *y = *w = *h = 0 ;
+    m_bitmap = hBitmap;
+    m_dc = 0;
+    m_width = w;
+    m_height = h;
+    m_depth = depth;

 }
 
 }
 

-#if WXWIN_COMPATIBILITY
-void wxDC::GetTextExtent(const wxString& string, float *x, float *y,
-                     float *descent, float *externalLeading,
-                     wxFont *theFont, bool use16bit) const
+wxDCCacheEntry::wxDCCacheEntry(WXHDC hDC, int depth)

 {
 {

-    long x1, y1, descent1, externalLeading1;
-    GetTextExtent(string, & x1, & y1, & descent1, & externalLeading1, theFont, use16bit);
-    *x = x1; *y = y1;
-    if (descent)
-        *descent = descent1;
-    if (externalLeading)
-        *externalLeading = externalLeading1;
+    m_bitmap = 0;
+    m_dc = hDC;
+    m_width = 0;
+    m_height = 0;
+    m_depth = depth;

 }
 }

-#endif

 
 

-int wxDC::GetDepth(void) const
+wxDCCacheEntry::~wxDCCacheEntry()

 {
 {

-  return (int) ::GetDeviceCaps((HDC) m_hDC,BITSPIXEL);
+    if (m_bitmap)
+        ::DeleteObject((HBITMAP) m_bitmap);
+    if (m_dc)
+        ::DeleteDC((HDC) m_dc);

 }
 
 }
 

-#if wxUSE_SPLINES
-
-// Make a 3-point spline
-void wxDC::DrawSpline(long x1, long y1, long x2, long y2, long x3, long y3)
+wxDCCacheEntry* wxDC::FindBitmapInCache(WXHDC dc, int w, int h)

 {
 {

-  wxList *point_list = new wxList;
-
-  wxPoint *point1 = new wxPoint;
-  point1->x = x1; point1->y = y1;
-  point_list->Append((wxObject*)point1);
-
-  wxPoint *point2 = new wxPoint;
-  point2->x = x2; point2->y = y2;
-  point_list->Append((wxObject*)point2);
-
-  wxPoint *point3 = new wxPoint;
-  point3->x = x3; point3->y = y3;
-  point_list->Append((wxObject*)point3);
+    int depth = ::GetDeviceCaps((HDC) dc, PLANES) * ::GetDeviceCaps((HDC) dc, BITSPIXEL);
+    wxList::compatibility_iterator node = sm_bitmapCache.GetFirst();
+    while (node)
+    {
+        wxDCCacheEntry* entry = (wxDCCacheEntry*) node->GetData();

 
 

-  DrawSpline(point_list);
+        if (entry->m_depth == depth)
+        {
+            if (entry->m_width < w || entry->m_height < h)
+            {
+                ::DeleteObject((HBITMAP) entry->m_bitmap);
+                entry->m_bitmap = (WXHBITMAP) ::CreateCompatibleBitmap((HDC) dc, w, h);
+                if ( !entry->m_bitmap)
+                {
+                    wxLogLastError(wxT("CreateCompatibleBitmap"));
+                }
+                entry->m_width = w; entry->m_height = h;
+                return entry;
+            }
+            return entry;
+        }

 
 

-  for(wxNode *node = point_list->First(); node; node = node->Next()) {
-    wxPoint *p = (wxPoint *)node->Data();
-    delete p;
-  }
-  delete point_list;
+        node = node->GetNext();
+    }
+    WXHBITMAP hBitmap = (WXHBITMAP) ::CreateCompatibleBitmap((HDC) dc, w, h);
+    if ( !hBitmap)
+    {
+        wxLogLastError(wxT("CreateCompatibleBitmap"));
+    }
+    wxDCCacheEntry* entry = new wxDCCacheEntry(hBitmap, w, h, depth);
+    AddToBitmapCache(entry);
+    return entry;

 }
 
 }
 

-////#define     wx_round(a)    (int)((a)+.5)
-//#define     wx_round(a)    (a)
-
-class wxSpline: public wxObject
+wxDCCacheEntry* wxDC::FindDCInCache(wxDCCacheEntry* notThis, WXHDC dc)

 {
 {

- public:
-  int type;
-  wxList *points;
+    int depth = ::GetDeviceCaps((HDC) dc, PLANES) * ::GetDeviceCaps((HDC) dc, BITSPIXEL);
+    wxList::compatibility_iterator node = sm_dcCache.GetFirst();
+    while (node)
+    {
+        wxDCCacheEntry* entry = (wxDCCacheEntry*) node->GetData();

 
 

-  wxSpline(wxList *list);
-  void DeletePoints(void);
+        // Don't return the same one as we already have
+        if (!notThis || (notThis != entry))
+        {
+            if (entry->m_depth == depth)
+            {
+                return entry;
+            }
+        }

 
 

-  // Doesn't delete points
-  ~wxSpline(void);
-};
+        node = node->GetNext();
+    }
+    WXHDC hDC = (WXHDC) ::CreateCompatibleDC((HDC) dc);
+    if ( !hDC)
+    {
+        wxLogLastError(wxT("CreateCompatibleDC"));
+    }
+    wxDCCacheEntry* entry = new wxDCCacheEntry(hDC, depth);
+    AddToDCCache(entry);
+    return entry;
+}

 
 

-void wxDC::DrawSpline(int n, wxPoint points[])
+void wxDC::AddToBitmapCache(wxDCCacheEntry* entry)

 {
 {

-  wxList list;
-  int i;
-  for (i =0; i < n; i++)
-    list.Append((wxObject*)&points[i]);
-  DrawSpline((wxList *)&list);
+    sm_bitmapCache.Append(entry);

 }
 
 }
 

-void wx_draw_open_spline(wxDC *dc, wxSpline *spline);
-
-void wx_quadratic_spline(double a1, double b1, double a2, double b2,
-                         double a3, double b3, double a4, double b4);
-void wx_clear_stack(void);
-int wx_spline_pop(double *x1, double *y1, double *x2, double *y2, double *x3,
-        double *y3, double *x4, double *y4);
-void wx_spline_push(double x1, double y1, double x2, double y2, double x3, double y3,
-          double x4, double y4);
-static bool wx_spline_add_point(double x, double y);
-static void wx_spline_draw_point_array(wxDC *dc);
-wxSpline *wx_make_spline(int x1, int y1, int x2, int y2, int x3, int y3);
-
-void wxDC::DrawSpline(wxList *list)
+void wxDC::AddToDCCache(wxDCCacheEntry* entry)

 {
 {

-  wxSpline spline(list);
-
-  wx_draw_open_spline(this, &spline);
+    sm_dcCache.Append(entry);

 }
 
 }
 

+void wxDC::ClearCache()
+{
+    WX_CLEAR_LIST(wxList, sm_dcCache);
+    WX_CLEAR_LIST(wxList, sm_bitmapCache);
+}

 
 

-wxList wx_spline_point_list;
-
-void wx_draw_open_spline(wxDC *dc, wxSpline *spline)
+// Clean up cache at app exit
+class wxDCModule : public wxModule

 {
 {

-    wxPoint *p;
-    double           cx1, cy1, cx2, cy2, cx3, cy3, cx4, cy4;
-    double           x1, y1, x2, y2;
+public:
+    virtual bool OnInit() { return true; }
+    virtual void OnExit() { wxDC::ClearCache(); }

 
 

-    wxNode *node = spline->points->First();
-    p = (wxPoint *)node->Data();
+private:
+    DECLARE_DYNAMIC_CLASS(wxDCModule)
+};

 
 

-    x1 = p->x;
-    y1 = p->y;
+IMPLEMENT_DYNAMIC_CLASS(wxDCModule, wxModule)

 
 

-    node = node->Next();
-    p = (wxPoint *)node->Data();
+#endif // wxUSE_DC_CACHEING

 
 

-    x2 = p->x;
-    y2 = p->y;
-    cx1 = (double)((x1 + x2) / 2);
-    cy1 = (double)((y1 + y2) / 2);
-    cx2 = (double)((cx1 + x2) / 2);
-    cy2 = (double)((cy1 + y2) / 2);
+// ----------------------------------------------------------------------------
+// alpha channel support
+// ----------------------------------------------------------------------------

 
 

-    wx_spline_add_point(x1, y1);
+static bool AlphaBlt(HDC hdcDst,
+                     int x, int y, int width, int height,
+                     int srcX, int srcY, HDC hdcSrc,
+                     const wxBitmap& bmp)
+{
+    wxASSERT_MSG( bmp.Ok() && bmp.HasAlpha(), _T("AlphaBlt(): invalid bitmap") );
+    wxASSERT_MSG( hdcDst && hdcSrc, _T("AlphaBlt(): invalid HDC") );

 
 

-    while ((node = node->Next()) != NULL)
-    {
-        p = (wxPoint *)node->Data();
-    x1 = x2;
-    y1 = y2;
-    x2 = p->x;
-    y2 = p->y;
-        cx4 = (double)(x1 + x2) / 2;
-        cy4 = (double)(y1 + y2) / 2;
-        cx3 = (double)(x1 + cx4) / 2;
-        cy3 = (double)(y1 + cy4) / 2;
+    // do we have AlphaBlend() and company in the headers?
+#if defined(AC_SRC_OVER) && wxUSE_DYNLIB_CLASS
+    // yes, now try to see if we have it during run-time
+    typedef BOOL (WINAPI *AlphaBlend_t)(HDC,int,int,int,int,
+                                        HDC,int,int,int,int,
+                                        BLENDFUNCTION);

 
 

-        wx_quadratic_spline(cx1, cy1, cx2, cy2, cx3, cy3, cx4, cy4);
+    static AlphaBlend_t
+        pfnAlphaBlend = (AlphaBlend_t)wxMSIMG32DLL.GetSymbol(_T("AlphaBlend"));
+    if ( pfnAlphaBlend )
+    {
+        BLENDFUNCTION bf;
+        bf.BlendOp = AC_SRC_OVER;
+        bf.BlendFlags = 0;
+        bf.SourceConstantAlpha = 0xff;
+        bf.AlphaFormat = AC_SRC_ALPHA;
+
+        if ( pfnAlphaBlend(hdcDst, x, y, width, height,
+                           hdcSrc, srcX, srcY, width, height,
+                           bf) )
+        {
+            // skip wxAlphaBlend() call below
+            return true;
+        }

 
 

-    cx1 = cx4;
-    cy1 = cy4;
-        cx2 = (double)(cx1 + x2) / 2;
-        cy2 = (double)(cy1 + y2) / 2;
+        wxLogLastError(_T("AlphaBlend"));

     }
     }

+#else
+    wxUnusedVar(hdcSrc);
+#endif // defined(AC_SRC_OVER)

 
 

-    wx_spline_add_point((double)wx_round(cx1), (double)wx_round(cy1));
-    wx_spline_add_point(x2, y2);
-
-    wx_spline_draw_point_array(dc);
+    // AlphaBlend() unavailable of failed: use our own (probably much slower)
+    // implementation
+#ifdef wxHAVE_RAW_BITMAP
+    wxAlphaBlend(hdcDst, x, y, width, height, srcX, srcY, bmp);

 
 

+    return true;
+#else // !wxHAVE_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

 }
 
 }
 

-/********************* CURVES FOR SPLINES *****************************

 
 

-    The following spline drawing routine is from
+// wxAlphaBlend: our fallback if ::AlphaBlend() is unavailable
+#ifdef wxHAVE_RAW_BITMAP

 
 

-    "An Algorithm for High-Speed Curve Generation"
-    by George Merrill Chaikin,
-    Computer Graphics and Image Processing, 3, Academic Press,
-    1974, 346-349.
-
-    and
+static void
+wxAlphaBlend(HDC hdcDst, int xDst, int yDst,
+             int w, int h,
+             int srcX, int srcY, const wxBitmap& bmpSrc)
+{
+    // get the destination DC pixels
+    wxBitmap bmpDst(w, h, 32 /* force creating RGBA DIB */);
+    MemoryHDC hdcMem;
+    SelectInHDC select(hdcMem, GetHbitmapOf(bmpDst));

 
 

-    "On Chaikin's Algorithm" by R. F. Riesenfeld,
-    Computer Graphics and Image Processing, 4, Academic Press,
-    1975, 304-310.
+    if ( !::BitBlt(hdcMem, 0, 0, w, h, hdcDst, xDst, yDst, SRCCOPY) )
+    {
+        wxLogLastError(_T("BitBlt"));
+    }

 
 

-***********************************************************************/
+    // combine them with the source bitmap using alpha
+    wxAlphaPixelData dataDst(bmpDst),
+                     dataSrc((wxBitmap &)bmpSrc);

 
 

-#define     half(z1, z2)    ((z1+z2)/2.0)
-#define     THRESHOLD   5
+    wxCHECK_RET( dataDst && dataSrc,
+                    _T("failed to get raw data in wxAlphaBlend") );

 
 

-/* iterative version */
+    wxAlphaPixelData::Iterator pDst(dataDst),
+                               pSrc(dataSrc);

 
 

-void wx_quadratic_spline(double a1, double b1, double a2, double b2, double a3, double b3, double a4,
-                 double b4)
-{
-    register double  xmid, ymid;
-    double           x1, y1, x2, y2, x3, y3, x4, y4;
+    pSrc.Offset(dataSrc, srcX, srcY);

 
 

-    wx_clear_stack();
-    wx_spline_push(a1, b1, a2, b2, a3, b3, a4, b4);
+    for ( int y = 0; y < h; y++ )
+    {
+        wxAlphaPixelData::Iterator pDstRowStart = pDst,
+                                   pSrcRowStart = pSrc;

 
 

-    while (wx_spline_pop(&x1, &y1, &x2, &y2, &x3, &y3, &x4, &y4)) {
-        xmid = (double)half(x2, x3);
-        ymid = (double)half(y2, y3);
-    if (fabs(x1 - xmid) < THRESHOLD && fabs(y1 - ymid) < THRESHOLD &&
-        fabs(xmid - x4) < THRESHOLD && fabs(ymid - y4) < THRESHOLD) {
-            wx_spline_add_point((double)wx_round(x1), (double)wx_round(y1));
-            wx_spline_add_point((double)wx_round(xmid), (double)wx_round(ymid));
-    } else {
-            wx_spline_push(xmid, ymid, (double)half(xmid, x3), (double)half(ymid, y3),
-                 (double)half(x3, x4), (double)half(y3, y4), x4, y4);
-            wx_spline_push(x1, y1, (double)half(x1, x2), (double)half(y1, y2),
-                 (double)half(x2, xmid), (double)half(y2, ymid), xmid, ymid);
-    }
-    }
-}
+        for ( int x = 0; x < w; x++ )
+        {
+            // note that source bitmap uses premultiplied alpha (as required by
+            // the real AlphaBlend)
+            const unsigned beta = 255 - pSrc.Alpha();

 
 

+            pDst.Red() = pSrc.Red() + (beta * pDst.Red() + 127) / 255;
+            pDst.Blue() = pSrc.Blue() + (beta * pDst.Blue() + 127) / 255;
+            pDst.Green() = pSrc.Green() + (beta * pDst.Green() + 127) / 255;

 
 

-/* utilities used by spline drawing routines */
+            ++pDst;
+            ++pSrc;
+        }

 
 

+        pDst = pDstRowStart;
+        pSrc = pSrcRowStart;
+        pDst.OffsetY(dataDst, 1);
+        pSrc.OffsetY(dataSrc, 1);
+    }

 
 

-typedef struct wx_spline_stack_struct {
-    double           x1, y1, x2, y2, x3, y3, x4, y4;
+    // and finally blit them back to the destination DC
+    if ( !::BitBlt(hdcDst, xDst, yDst, w, h, hdcMem, 0, 0, SRCCOPY) )
+    {
+        wxLogLastError(_T("BitBlt"));
+    }

 }
 }

-                Stack;

 
 

-#define         SPLINE_STACK_DEPTH             20
-static Stack    wx_spline_stack[SPLINE_STACK_DEPTH];
-static Stack   *wx_stack_top;
-static int      wx_stack_count;
+#endif // #ifdef wxHAVE_RAW_BITMAP

 
 

-void wx_clear_stack(void)
+void wxDC::DoGradientFillLinear (const wxRect& rect,
+                                 const wxColour& initialColour,
+                                 const wxColour& destColour,
+                                 wxDirection nDirection)

 {
 {

-    wx_stack_top = wx_spline_stack;
-    wx_stack_count = 0;
-}
+    // use native function if we have compile-time support it and can load it
+    // during run-time (linking to it statically would make the program
+    // unusable on earlier Windows versions)
+#if defined(GRADIENT_FILL_RECT_H) && wxUSE_DYNLIB_CLASS
+    typedef BOOL
+        (WINAPI *GradientFill_t)(HDC, PTRIVERTEX, ULONG, PVOID, ULONG, ULONG);
+    static GradientFill_t pfnGradientFill =
+        (GradientFill_t)wxMSIMG32DLL.GetSymbol(_T("GradientFill"));

 
 

-void wx_spline_push(double x1, double y1, double x2, double y2, double x3, double y3, double x4, double y4)
-{
-    wx_stack_top->x1 = x1;
-    wx_stack_top->y1 = y1;
-    wx_stack_top->x2 = x2;
-    wx_stack_top->y2 = y2;
-    wx_stack_top->x3 = x3;
-    wx_stack_top->y3 = y3;
-    wx_stack_top->x4 = x4;
-    wx_stack_top->y4 = y4;
-    wx_stack_top++;
-    wx_stack_count++;
-}
+    if ( pfnGradientFill )
+    {
+        GRADIENT_RECT grect;
+        grect.UpperLeft = 0;
+        grect.LowerRight = 1;
+
+        // invert colours direction if not filling from left-to-right or
+        // top-to-bottom
+        int firstVertex = nDirection == wxNORTH || nDirection == wxWEST ? 1 : 0;
+
+        // one vertex for upper left and one for upper-right
+        TRIVERTEX vertices[2];
+
+        vertices[0].x = rect.GetLeft();
+        vertices[0].y = rect.GetTop();
+        vertices[1].x = rect.GetRight();
+        vertices[1].y = rect.GetBottom();
+
+        vertices[firstVertex].Red = (COLOR16)(initialColour.Red() << 8);
+        vertices[firstVertex].Green = (COLOR16)(initialColour.Green() << 8);
+        vertices[firstVertex].Blue = (COLOR16)(initialColour.Blue() << 8);
+        vertices[firstVertex].Alpha = 0;
+        vertices[1 - firstVertex].Red = (COLOR16)(destColour.Red() << 8);
+        vertices[1 - firstVertex].Green = (COLOR16)(destColour.Green() << 8);
+        vertices[1 - firstVertex].Blue = (COLOR16)(destColour.Blue() << 8);
+        vertices[1 - firstVertex].Alpha = 0;
+
+        if ( (*pfnGradientFill)
+             (
+                GetHdc(),
+                vertices,
+                WXSIZEOF(vertices),
+                &grect,
+                1,
+                nDirection == wxWEST || nDirection == wxEAST
+                    ? GRADIENT_FILL_RECT_H
+                    : GRADIENT_FILL_RECT_V
+             ) )
+        {
+            // skip call of the base class version below
+            return;
+        }

 
 

-int wx_spline_pop(double *x1, double *y1, double *x2, double *y2,
-                  double *x3, double *y3, double *x4, double *y4)
-{
-    if (wx_stack_count == 0)
-    return (0);
-    wx_stack_top--;
-    wx_stack_count--;
-    *x1 = wx_stack_top->x1;
-    *y1 = wx_stack_top->y1;
-    *x2 = wx_stack_top->x2;
-    *y2 = wx_stack_top->y2;
-    *x3 = wx_stack_top->x3;
-    *y3 = wx_stack_top->y3;
-    *x4 = wx_stack_top->x4;
-    *y4 = wx_stack_top->y4;
-    return (1);
-}
+        wxLogLastError(_T("GradientFill"));
+    }
+#endif // wxUSE_DYNLIB_CLASS

 
 

-static bool wx_spline_add_point(double x, double y)
-{
-  wxPoint *point = new wxPoint ;
-  point->x = (int) x;
-  point->y = (int) y;
-  wx_spline_point_list.Append((wxObject*)point);
-  return TRUE;
+    wxDCBase::DoGradientFillLinear(rect, initialColour, destColour, nDirection);

 }
 
 }
 

-static void wx_spline_draw_point_array(wxDC *dc)
+static DWORD wxGetDCLayout(HDC hdc)

 {
 {

-  dc->DrawLines(&wx_spline_point_list, (double)0.0, (double)0.0);
-  wxNode *node = wx_spline_point_list.First();
-  while (node)
-  {
-    wxPoint *point = (wxPoint *)node->Data();
-    delete point;
-    delete node;
-    node = wx_spline_point_list.First();
-  }
-}
+    typedef DWORD (WINAPI *GetLayout_t)(HDC);
+    static GetLayout_t
+        pfnGetLayout = (GetLayout_t)wxGDI32DLL.GetSymbol(_T("GetLayout"));

 
 

-wxSpline::wxSpline(wxList *list)
-{
-  points = list;
+    return pfnGetLayout ? pfnGetLayout(hdc) : (DWORD)-1;

 }
 
 }
 

-wxSpline::~wxSpline(void)
+wxLayoutDirection wxDC::GetLayoutDirection() const

 {
 {

+    DWORD layout = wxGetDCLayout(GetHdc());
+
+    if ( layout == (DWORD)-1 )
+        return wxLayout_Default;
+
+    return layout & LAYOUT_RTL ? wxLayout_RightToLeft : wxLayout_LeftToRight;

 }
 
 }
 

-void wxSpline::DeletePoints(void)
+void wxDC::SetLayoutDirection(wxLayoutDirection dir)

 {
 {

-  for(wxNode *node = points->First(); node; node = points->First())
-  {
-    wxPoint *point = (wxPoint *)node->Data();
-    delete point;
-    delete node;
-  }
-  delete points;
-}
+    typedef DWORD (WINAPI *SetLayout_t)(HDC, DWORD);
+    static SetLayout_t
+        pfnSetLayout = (SetLayout_t)wxGDI32DLL.GetSymbol(_T("SetLayout"));
+    if ( !pfnSetLayout )
+        return;

 
 

+    if ( dir == wxLayout_Default )
+    {
+        dir = wxTheApp->GetLayoutDirection();
+        if ( dir == wxLayout_Default )
+            return;
+    }

 
 

-#endif // wxUSE_SPLINES
+    DWORD layout = wxGetDCLayout(GetHdc());
+    if ( dir == wxLayout_RightToLeft )
+        layout |= LAYOUT_RTL;
+    else
+        layout &= ~LAYOUT_RTL;

 
 

+    pfnSetLayout(GetHdc(), layout);
+}