return begining of the selection for GetInsertionPoint to match what

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

diff --git a/src/msw/dc.cpp b/src/msw/dc.cpp
index 984a3153457efbe1d64328da19c548b8f5bce3bb..22e2455e0a6217250d2da69fb63100693f517083 100644 (file)
--- a/src/msw/dc.cpp
+++ b/src/msw/dc.cpp
@@ -5,7 +5,7 @@
 // Modified by:
 // Created:     01/02/97
 // RCS-ID:      $Id$
 // 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
 /////////////////////////////////////////////////////////////////////////////
 


@@ -17,7 +17,7 @@
 // headers
 // ---------------------------------------------------------------------------
 
 // headers
 // ---------------------------------------------------------------------------
 

-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)

     #pragma implementation "dc.h"
 #endif
 
     #pragma implementation "dc.h"
 #endif
 


@@ -29,6 +29,7 @@
 #endif
 
 #ifndef WX_PRECOMP
 #endif
 
 #ifndef WX_PRECOMP

+    #include "wx/image.h"

     #include "wx/window.h"
     #include "wx/dc.h"
     #include "wx/utils.h"
     #include "wx/window.h"
     #include "wx/dc.h"
     #include "wx/utils.h"


@@ -40,19 +41,39 @@
     #include "wx/icon.h"
 #endif
 
     #include "wx/icon.h"
 #endif
 

+#include "wx/sysopt.h"

 #include "wx/dcprint.h"
 #include "wx/dcprint.h"

+#include "wx/module.h"
+#include "wx/dynload.h"
+
+#ifdef wxHAVE_RAW_BITMAP
+#include "wx/rawbmp.h"
+#endif

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

-#include <math.h>

 
 

-#include "wx/msw/private.h" // needs to be before #include <commdlg.h>
+#include "wx/msw/wrapcdlg.h"
+#ifndef __WIN32__
+    #include <print.h>
+#endif

 
 

-#if wxUSE_COMMON_DIALOGS
-    #include <commdlg.h>
+#ifndef AC_SRC_ALPHA
+#define AC_SRC_ALPHA 1

 #endif
 
 #endif
 

-#ifndef __WIN32__
-    #include <print.h>
+/* Quaternary raster codes */
+#ifndef MAKEROP4
+#define MAKEROP4(fore,back) (DWORD)((((back) << 8) & 0xFF000000) | (fore))
+#endif
+
+// 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
 
 IMPLEMENT_ABSTRACT_CLASS(wxDC, wxDCBase)
 #endif
 
 IMPLEMENT_ABSTRACT_CLASS(wxDC, wxDCBase)


@@ -66,15 +87,33 @@ static const int VIEWPORT_EXTENT = 1000;
 static const int MM_POINTS = 9;
 static const int MM_METRIC = 10;
 
 static const int MM_POINTS = 9;
 static const int MM_METRIC = 10;
 

-// usually this is defined in math.h
-#ifndef M_PI
-    static const double M_PI = 3.14159265358979323846;
-#endif // M_PI
-

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

+// ----------------------------------------------------------------------------
+// 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+m_deviceOriginX)
+    #define YLOG2DEV(y) ((y-m_logicalOriginY)*m_signY+m_deviceOriginY)
+    #define XDEV2LOG(x) ((x-m_deviceOriginX)*m_signX+m_logicalOriginX)
+    #define YDEV2LOG(y) ((y-m_deviceOriginY)*m_signY+m_logicalOriginY)
+#else
+    #define XLOG2DEV(x) (x)
+    #define YLOG2DEV(y) (y)
+    #define XDEV2LOG(x) (x)
+    #define YDEV2LOG(y) (y)
+#endif
+

 // ---------------------------------------------------------------------------
 // private functions
 // ---------------------------------------------------------------------------
 // ---------------------------------------------------------------------------
 // private functions
 // ---------------------------------------------------------------------------


@@ -82,6 +121,25 @@ static const int MM_METRIC = 10;
 // convert degrees to radians
 static inline double DegToRad(double deg) { return (deg * M_PI) / 180.0; }
 
 // convert degrees to radians
 static inline double DegToRad(double deg) { return (deg * M_PI) / 180.0; }
 

+// 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,
+                     HDC hdcSrc,
+                     const wxBitmap& bmpSrc);
+
+#ifdef wxHAVE_RAW_BITMAP
+// our (limited) AlphaBlend() replacement
+static void
+wxAlphaBlend(HDC hdcDst, int x, int y, int w, int h, const wxBitmap& bmp);
+#endif
+

 // ----------------------------------------------------------------------------
 // private classes
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // private classes
 // ----------------------------------------------------------------------------


@@ -104,6 +162,40 @@ private:
     COLORREF m_colFgOld, m_colBgOld;
 
     bool m_changed;
     COLORREF m_colFgOld, m_colBgOld;
 
     bool m_changed;

+
+    DECLARE_NO_COPY_CLASS(wxColourChanger)
+};
+
+// this class saves the old stretch blit mode during its life time
+class StretchBltModeChanger
+{
+public:
+    StretchBltModeChanger(HDC hdc, int mode)
+        : m_hdc(hdc)
+    {
+#ifndef __WXWINCE__
+        m_modeOld = ::SetStretchBltMode(m_hdc, mode);
+        if ( !m_modeOld )
+            wxLogLastError(_T("SetStretchBltMode"));
+#else
+        wxUnusedVar(mode);
+#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)

 };
 
 // ===========================================================================
 };
 
 // ===========================================================================


@@ -116,13 +208,14 @@ private:
 
 wxColourChanger::wxColourChanger(wxDC& dc) : m_dc(dc)
 {
 
 wxColourChanger::wxColourChanger(wxDC& dc) : m_dc(dc)
 {

-    if ( dc.GetBrush().GetStyle() == wxSTIPPLE_MASK_OPAQUE )
+    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);
 
     {
         HDC hdc = GetHdcOf(dc);
         m_colFgOld = ::GetTextColor(hdc);
         m_colBgOld = ::GetBkColor(hdc);
 

-        // note that Windows convention is opposite to wxWindows one, this is
+        // 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() )
         // why text colour becomes the background one and vice versa
         const wxColour& colFg = dc.GetTextForeground();
         if ( colFg.Ok() )


@@ -141,12 +234,12 @@ wxColourChanger::wxColourChanger(wxDC& dc) : m_dc(dc)
                                                           : OPAQUE);
 
         // flag which telsl us to undo changes in the dtor
                                                           : OPAQUE);
 
         // flag which telsl us to undo changes in the dtor

-        m_changed = TRUE;
+        m_changed = true;

     }
     else
     {
         // nothing done, nothing to undo
     }
     else
     {
         // nothing done, nothing to undo

-        m_changed = FALSE;
+        m_changed = false;

     }
 }
 
     }
 }
 


@@ -176,30 +269,39 @@ wxDC::wxDC()
     m_oldPen = 0;
     m_oldBrush = 0;
     m_oldFont = 0;
     m_oldPen = 0;
     m_oldBrush = 0;
     m_oldFont = 0;

+#if wxUSE_PALETTE

     m_oldPalette = 0;
     m_oldPalette = 0;

+#endif // wxUSE_PALETTE

 
 

-    m_bOwnsDC = FALSE;
+    m_bOwnsDC = false;

     m_hDC = 0;
     m_hDC = 0;

-
-    m_windowExtX = VIEWPORT_EXTENT;
-    m_windowExtY = VIEWPORT_EXTENT;
-
-    m_hDCCount = 0;

 }
 
 }
 

-

 wxDC::~wxDC()
 {
 wxDC::~wxDC()
 {

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

         SelectOldObjects(m_hDC);
         SelectOldObjects(m_hDC);

-        if ( m_bOwnsDC ) {
-            if ( m_canvas == NULL )
-                ::DeleteDC(GetHdc());
+
+        // 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
             else

-                ::ReleaseDC((HWND)m_canvas->GetHWND(), GetHdc());
+            {
+                // 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,


@@ -212,10 +314,12 @@ void wxDC::SelectOldObjects(WXHDC dc)
         if (m_oldBitmap)
         {
             ::SelectObject((HDC) dc, (HBITMAP) m_oldBitmap);
         if (m_oldBitmap)
         {
             ::SelectObject((HDC) dc, (HBITMAP) m_oldBitmap);

+#ifdef __WXDEBUG__

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

+#endif

         }
         m_oldBitmap = 0;
         if (m_oldPen)
         }
         m_oldBitmap = 0;
         if (m_oldPen)


@@ -233,16 +337,21 @@ void wxDC::SelectOldObjects(WXHDC dc)
             ::SelectObject((HDC) dc, (HFONT) m_oldFont);
         }
         m_oldFont = 0;
             ::SelectObject((HDC) dc, (HFONT) m_oldFont);
         }
         m_oldFont = 0;

+
+#if wxUSE_PALETTE

         if (m_oldPalette)
         {
         if (m_oldPalette)
         {

-            ::SelectPalette((HDC) dc, (HPALETTE) m_oldPalette, TRUE);
+            ::SelectPalette((HDC) dc, (HPALETTE) m_oldPalette, FALSE);

         }
         m_oldPalette = 0;
         }
         m_oldPalette = 0;

+#endif // wxUSE_PALETTE

     }
 
     m_brush = wxNullBrush;
     m_pen = wxNullPen;
     }
 
     m_brush = wxNullBrush;
     m_pen = wxNullPen;

+#if wxUSE_PALETTE

     m_palette = wxNullPalette;
     m_palette = wxNullPalette;

+#endif // wxUSE_PALETTE

     m_font = wxNullFont;
     m_backgroundBrush = wxNullBrush;
     m_selectedBitmap = wxNullBitmap;
     m_font = wxNullFont;
     m_backgroundBrush = wxNullBrush;
     m_selectedBitmap = wxNullBitmap;


@@ -252,53 +361,120 @@ void wxDC::SelectOldObjects(WXHDC dc)
 // clipping
 // ---------------------------------------------------------------------------
 
 // clipping
 // ---------------------------------------------------------------------------
 

-#define DO_SET_CLIPPING_BOX()                   \
-{                                               \
-    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::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::DoSetClippingRegion(wxCoord cx, wxCoord cy, wxCoord cw, wxCoord ch)
+void
+wxDC::DoGetClippingBox(wxCoord *x, wxCoord *y, wxCoord *w, wxCoord *h) const

 {
 {

-    m_clipping = TRUE;
-    IntersectClipRect(GetHdc(), XLOG2DEV(cx), YLOG2DEV(cy),
-                                XLOG2DEV(cx + cw), YLOG2DEV(cy + ch));
-    DO_SET_CLIPPING_BOX()
+    // check if we should try to retrieve the clipping region possibly not set
+    // by our SetClippingRegion() but preset by Windows:this can only happen
+    // when we're associated with an existing HDC usign SetHDC(), see there
+    if ( m_clipping && !m_clipX1 && !m_clipX2 )
+    {
+        wxDC *self = wxConstCast(this, wxDC);
+        self->UpdateClipBox();
+
+        if ( !m_clipX1 && !m_clipX2 )
+            self->m_clipping = false;
+    }
+
+    wxDCBase::DoGetClippingBox(x, y, w, h);

 }
 
 }
 

-void wxDC::DoSetClippingRegionAsRegion(const wxRegion& region)
+// common part of DoSetClippingRegion() and DoSetClippingRegionAsRegion()
+void wxDC::SetClippingHrgn(WXHRGN hrgn)

 {
 {

-    wxCHECK_RET( region.GetHRGN(), wxT("invalid clipping region") );
+    wxCHECK_RET( hrgn, wxT("invalid clipping region") );

 
 

-    m_clipping = TRUE;
+    WXMICROWIN_CHECK_HDC

 
 

-#ifdef __WIN16__
-    SelectClipRgn(GetHdc(), (HRGN) region.GetHRGN());
-#else
-    ExtSelectClipRgn(GetHdc(), (HRGN) region.GetHRGN(), RGN_AND);
-#endif
+    // 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;
+
+    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 )
+    {
+        ::SelectClipRgn(GetHdc(), hrgnDest);
+    }
+
+    ::DeleteObject(hrgnClipOld);
+    ::DeleteObject(hrgnDest);
+#else // !WinCE
+    if ( ::ExtSelectClipRgn(GetHdc(), (HRGN)hrgn, RGN_AND) == ERROR )
+    {
+        wxLogLastError(_T("ExtSelectClipRgn"));
+
+        return;
+    }
+#endif // WinCE/!WinCE
+
+    m_clipping = true;
+
+    UpdateClipBox();
+}
+
+void wxDC::DoSetClippingRegion(wxCoord x, wxCoord y, wxCoord w, wxCoord h)
+{
+    // 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);
+
+        ::DeleteObject(hrgn);
+    }
+}

 
 

-    DO_SET_CLIPPING_BOX()
+void wxDC::DoSetClippingRegionAsRegion(const wxRegion& region)
+{
+    SetClippingHrgn(region.GetHRGN());

 }
 
 void wxDC::DestroyClippingRegion()
 {
 }
 
 void wxDC::DestroyClippingRegion()
 {

+    WXMICROWIN_CHECK_HDC
+

     if (m_clipping && m_hDC)
     {
         // TODO: this should restore the previous clipping region,
     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.
+        //       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);
         HRGN rgn = CreateRectRgn(0, 0, 32000, 32000);

-        SelectClipRgn(GetHdc(), rgn);
-        DeleteObject(rgn);
+        ::SelectClipRgn(GetHdc(), rgn);
+        ::DeleteObject(rgn);

     }
     }

-    m_clipping = FALSE;
+
+    wxDCBase::DestroyClippingRegion();

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


@@ -307,19 +483,26 @@ void wxDC::DestroyClippingRegion()
 
 bool wxDC::CanDrawBitmap() const
 {
 
 bool wxDC::CanDrawBitmap() const
 {

-    return TRUE;
+    return true;

 }
 
 bool wxDC::CanGetTextExtent() const
 {
 }
 
 bool wxDC::CanGetTextExtent() const
 {

+#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);
     // What sort of display is it?
     int technology = ::GetDeviceCaps(GetHdc(), TECHNOLOGY);
 
     return (technology == DT_RASDISPLAY) || (technology == DT_RASPRINTER);

+#endif

 }
 
 int wxDC::GetDepth() const
 {
 }
 
 int wxDC::GetDepth() const
 {

+    WXMICROWIN_CHECK_HDC_RET(16)
+

     return (int)::GetDeviceCaps(GetHdc(), BITSPIXEL);
 }
 
     return (int)::GetDeviceCaps(GetHdc(), BITSPIXEL);
 }
 


@@ -329,6 +512,8 @@ int wxDC::GetDepth() const
 
 void wxDC::Clear()
 {
 
 void wxDC::Clear()
 {

+    WXMICROWIN_CHECK_HDC
+

     RECT rect;
     if ( m_canvas )
     {
     RECT rect;
     if ( m_canvas )
     {


@@ -347,26 +532,45 @@ void wxDC::Clear()
         rect.bottom = m_selectedBitmap.GetHeight();
     }
 
         rect.bottom = m_selectedBitmap.GetHeight();
     }
 

+#ifndef __WXWINCE__

     (void) ::SetMapMode(GetHdc(), MM_TEXT);
     (void) ::SetMapMode(GetHdc(), MM_TEXT);

+#endif
+
+    DWORD colour = ::GetBkColor(GetHdc());
+    HBRUSH brush = ::CreateSolidBrush(colour);
+    ::FillRect(GetHdc(), &rect, brush);
+    ::DeleteObject(brush);

 
 

-    DWORD colour = GetBkColor(GetHdc());
-    HBRUSH brush = CreateSolidBrush(colour);
-    FillRect(GetHdc(), &rect, brush);
-    DeleteObject(brush);
+#ifndef __WXWINCE__
+    int width = DeviceToLogicalXRel(VIEWPORT_EXTENT)*m_signX,
+        height = DeviceToLogicalYRel(VIEWPORT_EXTENT)*m_signY;

 
     ::SetMapMode(GetHdc(), MM_ANISOTROPIC);
 
     ::SetMapMode(GetHdc(), MM_ANISOTROPIC);

+

     ::SetViewportExtEx(GetHdc(), VIEWPORT_EXTENT, VIEWPORT_EXTENT, NULL);
     ::SetViewportExtEx(GetHdc(), VIEWPORT_EXTENT, VIEWPORT_EXTENT, NULL);

-    ::SetWindowExtEx(GetHdc(), m_windowExtX, m_windowExtY, NULL);
+    ::SetWindowExtEx(GetHdc(), width, height, NULL);

     ::SetViewportOrgEx(GetHdc(), (int)m_deviceOriginX, (int)m_deviceOriginY, NULL);
     ::SetWindowOrgEx(GetHdc(), (int)m_logicalOriginX, (int)m_logicalOriginY, NULL);
     ::SetViewportOrgEx(GetHdc(), (int)m_deviceOriginX, (int)m_deviceOriginY, NULL);
     ::SetWindowOrgEx(GetHdc(), (int)m_logicalOriginX, (int)m_logicalOriginY, NULL);

+#endif

 }
 
 }
 

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

 {
 {

-    if ( !::ExtFloodFill(GetHdc(), XLOG2DEV(x), YLOG2DEV(y),
+#ifdef __WXWINCE__
+    wxUnusedVar(x);
+    wxUnusedVar(y);
+    wxUnusedVar(col);
+    wxUnusedVar(style);
+    return false;
+#else
+
+    WXMICROWIN_CHECK_HDC_RET(false)
+
+    bool success = (0 != ::ExtFloodFill(GetHdc(), XLOG2DEV(x), YLOG2DEV(y),

                          col.GetPixel(),
                          style == wxFLOOD_SURFACE ? FLOODFILLSURFACE
                          col.GetPixel(),
                          style == wxFLOOD_SURFACE ? FLOODFILLSURFACE

-                                                  : FLOODFILLBORDER) )
+                                                  : FLOODFILLBORDER) ) ;
+    if (!success)

     {
         // quoting from the MSDN docs:
         //
     {
         // quoting from the MSDN docs:
         //


@@ -384,32 +588,36 @@ void wxDC::DoFloodFill(wxCoord x, wxCoord y, const wxColour& col, int style)
     }
 
     CalcBoundingBox(x, y);
     }
 
     CalcBoundingBox(x, y);

+
+    return success;
+#endif

 }
 
 bool wxDC::DoGetPixel(wxCoord x, wxCoord y, wxColour *col) const
 {
 }
 
 bool wxDC::DoGetPixel(wxCoord x, wxCoord y, wxColour *col) const
 {

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

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

-    return TRUE;
+    return true;

 }
 
 void wxDC::DoCrossHair(wxCoord x, wxCoord y)
 {
 }
 
 void wxDC::DoCrossHair(wxCoord x, wxCoord y)
 {

+    WXMICROWIN_CHECK_HDC
+

     wxCoord x1 = x-VIEWPORT_EXTENT;
     wxCoord y1 = y-VIEWPORT_EXTENT;
     wxCoord x2 = x+VIEWPORT_EXTENT;
     wxCoord y2 = y+VIEWPORT_EXTENT;
 
     wxCoord x1 = x-VIEWPORT_EXTENT;
     wxCoord y1 = y-VIEWPORT_EXTENT;
     wxCoord x2 = x+VIEWPORT_EXTENT;
     wxCoord y2 = y+VIEWPORT_EXTENT;
 

-    (void)MoveToEx(GetHdc(), XLOG2DEV(x1), YLOG2DEV(y), NULL);
-    (void)LineTo(GetHdc(), XLOG2DEV(x2), YLOG2DEV(y));
-
-    (void)MoveToEx(GetHdc(), XLOG2DEV(x), YLOG2DEV(y1), NULL);
-    (void)LineTo(GetHdc(), XLOG2DEV(x), YLOG2DEV(y2));
+    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);
 
     CalcBoundingBox(x1, y1);
     CalcBoundingBox(x2, y2);


@@ -417,12 +625,9 @@ void wxDC::DoCrossHair(wxCoord x, wxCoord y)
 
 void wxDC::DoDrawLine(wxCoord x1, wxCoord y1, wxCoord x2, wxCoord y2)
 {
 
 void wxDC::DoDrawLine(wxCoord x1, wxCoord y1, wxCoord x2, wxCoord y2)
 {

-    (void)MoveToEx(GetHdc(), XLOG2DEV(x1), YLOG2DEV(y1), NULL);
-    (void)LineTo(GetHdc(), XLOG2DEV(x2), YLOG2DEV(y2));
+    WXMICROWIN_CHECK_HDC

 
 

-    // Normalization: Windows doesn't draw the last point of the line.
-    // But apparently neither does GTK+, so we take it out again.
-//    (void)LineTo(GetHdc(), XLOG2DEV(x2) + 1, YLOG2DEV(y2));
+    wxDrawLine(GetHdc(), XLOG2DEV(x1), YLOG2DEV(y1), XLOG2DEV(x2), YLOG2DEV(y2));

 
     CalcBoundingBox(x1, y1);
     CalcBoundingBox(x2, y2);
 
     CalcBoundingBox(x1, y1);
     CalcBoundingBox(x2, y2);


@@ -434,6 +639,17 @@ void wxDC::DoDrawArc(wxCoord x1, wxCoord y1,
                      wxCoord x2, wxCoord y2,
                      wxCoord xc, wxCoord yc)
 {
                      wxCoord x2, wxCoord y2,
                      wxCoord xc, wxCoord yc)
 {

+#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
+

     wxColourChanger cc(*this); // needed for wxSTIPPLE_MASK_OPAQUE handling
 
     double dx = xc - x1;
     wxColourChanger cc(*this); // needed for wxSTIPPLE_MASK_OPAQUE handling
 
     double dx = xc - x1;


@@ -477,38 +693,45 @@ void wxDC::DoDrawArc(wxCoord x1, wxCoord y1,
 
     CalcBoundingBox(xc - r, yc - r);
     CalcBoundingBox(xc + r, yc + r);
 
     CalcBoundingBox(xc - r, yc - r);
     CalcBoundingBox(xc + r, yc + r);

+#endif

 }
 
 void wxDC::DoDrawCheckMark(wxCoord x1, wxCoord y1,
                            wxCoord width, wxCoord height)
 {
 }
 
 void wxDC::DoDrawCheckMark(wxCoord x1, wxCoord y1,
                            wxCoord width, wxCoord height)
 {

+    WXMICROWIN_CHECK_HDC
+

     wxCoord x2 = x1 + width,
             y2 = y1 + height;
 
     wxCoord x2 = x1 + width,
             y2 = y1 + height;
 

-#if defined(__WIN32__) && !defined(__SC__)
+#if defined(__WIN32__) && !defined(__SYMANTEC__) && !defined(__WXMICROWIN__)

     RECT rect;
     rect.left   = x1;
     rect.top    = y1;
     rect.right  = x2;
     rect.bottom = y2;
 
     RECT rect;
     rect.left   = x1;
     rect.top    = y1;
     rect.right  = x2;
     rect.bottom = y2;
 

+#ifdef __WXWINCE__
+    DrawFrameControl(GetHdc(), &rect, DFC_BUTTON, DFCS_BUTTONCHECK);
+#else

     DrawFrameControl(GetHdc(), &rect, DFC_MENU, DFCS_MENUCHECK);
     DrawFrameControl(GetHdc(), &rect, DFC_MENU, DFCS_MENUCHECK);

-#else // Win16
-    // In WIN16, draw a cross
+#endif
+#else // Symantec-MicroWin
+    // draw a cross

     HPEN blackPen = ::CreatePen(PS_SOLID, 1, RGB(0, 0, 0));
     HPEN whiteBrush = (HPEN)::GetStockObject(WHITE_BRUSH);
     HPEN hPenOld = (HPEN)::SelectObject(GetHdc(), blackPen);
     HPEN hBrushOld = (HPEN)::SelectObject(GetHdc(), whiteBrush);
     ::SetROP2(GetHdc(), R2_COPYPEN);
     Rectangle(GetHdc(), x1, y1, x2, y2);
     HPEN blackPen = ::CreatePen(PS_SOLID, 1, RGB(0, 0, 0));
     HPEN whiteBrush = (HPEN)::GetStockObject(WHITE_BRUSH);
     HPEN hPenOld = (HPEN)::SelectObject(GetHdc(), blackPen);
     HPEN hBrushOld = (HPEN)::SelectObject(GetHdc(), whiteBrush);
     ::SetROP2(GetHdc(), R2_COPYPEN);
     Rectangle(GetHdc(), x1, y1, x2, y2);

-    MoveTo(GetHdc(), x1, y1);
+    MoveToEx(GetHdc(), x1, y1, NULL);

     LineTo(GetHdc(), x2, y2);
     LineTo(GetHdc(), x2, y2);

-    MoveTo(GetHdc(), x2, y1);
+    MoveToEx(GetHdc(), x2, y1, NULL);

     LineTo(GetHdc(), x1, y2);
     ::SelectObject(GetHdc(), hPenOld);
     ::SelectObject(GetHdc(), hBrushOld);
     ::DeleteObject(blackPen);
     LineTo(GetHdc(), x1, y2);
     ::SelectObject(GetHdc(), hPenOld);
     ::SelectObject(GetHdc(), hBrushOld);
     ::DeleteObject(blackPen);

-#endif // Win32/16
+#endif // Win32/Symantec-MicroWin

 
     CalcBoundingBox(x1, y1);
     CalcBoundingBox(x2, y2);
 
     CalcBoundingBox(x1, y1);
     CalcBoundingBox(x2, y2);


@@ -516,6 +739,8 @@ void wxDC::DoDrawCheckMark(wxCoord x1, wxCoord y1,
 
 void wxDC::DoDrawPoint(wxCoord x, wxCoord y)
 {
 
 void wxDC::DoDrawPoint(wxCoord x, wxCoord y)
 {

+    WXMICROWIN_CHECK_HDC
+

     COLORREF color = 0x00ffffff;
     if (m_pen.Ok())
     {
     COLORREF color = 0x00ffffff;
     if (m_pen.Ok())
     {


@@ -529,6 +754,8 @@ void wxDC::DoDrawPoint(wxCoord x, wxCoord y)
 
 void wxDC::DoDrawPolygon(int n, wxPoint points[], wxCoord xoffset, wxCoord yoffset,int fillStyle)
 {
 
 void wxDC::DoDrawPolygon(int n, wxPoint points[], wxCoord xoffset, wxCoord yoffset,int fillStyle)
 {

+    WXMICROWIN_CHECK_HDC
+

     wxColourChanger cc(*this); // needed for wxSTIPPLE_MASK_OPAQUE handling
 
     // Do things less efficiently if we have offsets
     wxColourChanger cc(*this); // needed for wxSTIPPLE_MASK_OPAQUE handling
 
     // Do things less efficiently if we have offsets


@@ -543,9 +770,15 @@ void wxDC::DoDrawPolygon(int n, wxPoint points[], wxCoord xoffset, wxCoord yoffs
 
             CalcBoundingBox(cpoints[i].x, cpoints[i].y);
         }
 
             CalcBoundingBox(cpoints[i].x, cpoints[i].y);
         }

+#ifndef __WXWINCE__

         int prev = SetPolyFillMode(GetHdc(),fillStyle==wxODDEVEN_RULE?ALTERNATE:WINDING);
         int prev = SetPolyFillMode(GetHdc(),fillStyle==wxODDEVEN_RULE?ALTERNATE:WINDING);

+#else
+        wxUnusedVar(fillStyle);
+#endif

         (void)Polygon(GetHdc(), cpoints, n);
         (void)Polygon(GetHdc(), cpoints, n);

+#ifndef __WXWINCE__

         SetPolyFillMode(GetHdc(),prev);
         SetPolyFillMode(GetHdc(),prev);

+#endif

         delete[] cpoints;
     }
     else
         delete[] cpoints;
     }
     else


@@ -554,14 +787,75 @@ void wxDC::DoDrawPolygon(int n, wxPoint points[], wxCoord xoffset, wxCoord yoffs
         for (i = 0; i < n; i++)
             CalcBoundingBox(points[i].x, points[i].y);
 
         for (i = 0; i < n; i++)
             CalcBoundingBox(points[i].x, points[i].y);
 

+#ifndef __WXWINCE__

         int prev = SetPolyFillMode(GetHdc(),fillStyle==wxODDEVEN_RULE?ALTERNATE:WINDING);
         int prev = SetPolyFillMode(GetHdc(),fillStyle==wxODDEVEN_RULE?ALTERNATE:WINDING);

+#endif

         (void)Polygon(GetHdc(), (POINT*) points, n);
         (void)Polygon(GetHdc(), (POINT*) points, n);

+#ifndef __WXWINCE__
+        SetPolyFillMode(GetHdc(),prev);
+#endif
+    }
+}
+
+void
+wxDC::DoDrawPolyPolygon(int n,
+                        int count[],
+                        wxPoint points[],
+                        wxCoord xoffset,
+                        wxCoord yoffset,
+                        int fillStyle)
+{
+#ifdef __WXWINCE__
+    wxDCBase::DoDrawPolyPolygon(n, count, points, xoffset, yoffset, fillStyle);
+#else
+    WXMICROWIN_CHECK_HDC
+
+    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(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);
         SetPolyFillMode(GetHdc(),prev);

+#endif

     }
     }

+#endif
+  // __WXWINCE__

 }
 
 void wxDC::DoDrawLines(int n, wxPoint points[], wxCoord xoffset, wxCoord yoffset)
 {
 }
 
 void wxDC::DoDrawLines(int n, wxPoint points[], wxCoord xoffset, wxCoord yoffset)
 {

+    WXMICROWIN_CHECK_HDC
+

     // Do things less efficiently if we have offsets
     if (xoffset != 0 || yoffset != 0)
     {
     // Do things less efficiently if we have offsets
     if (xoffset != 0 || yoffset != 0)
     {


@@ -589,6 +883,8 @@ void wxDC::DoDrawLines(int n, wxPoint points[], wxCoord xoffset, wxCoord yoffset
 
 void wxDC::DoDrawRectangle(wxCoord x, wxCoord y, wxCoord width, wxCoord height)
 {
 
 void wxDC::DoDrawRectangle(wxCoord x, wxCoord y, wxCoord width, wxCoord height)
 {

+    WXMICROWIN_CHECK_HDC
+

     wxColourChanger cc(*this); // needed for wxSTIPPLE_MASK_OPAQUE handling
 
     wxCoord x2 = x + width;
     wxColourChanger cc(*this); // needed for wxSTIPPLE_MASK_OPAQUE handling
 
     wxCoord x2 = x + width;


@@ -612,8 +908,11 @@ void wxDC::DoDrawRectangle(wxCoord x, wxCoord y, wxCoord width, wxCoord height)
         // I wonder if this shouldn´t be done after the LOG2DEV() conversions. RR.
         if ( m_pen.GetStyle() == wxTRANSPARENT )
         {
         // 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++;
             x2++;
             y2++;

+#endif

         }
 
         (void)Rectangle(GetHdc(), XLOG2DEV(x), YLOG2DEV(y), XLOG2DEV(x2), YLOG2DEV(y2));
         }
 
         (void)Rectangle(GetHdc(), XLOG2DEV(x), YLOG2DEV(y), XLOG2DEV(x2), YLOG2DEV(y2));


@@ -626,6 +925,8 @@ void wxDC::DoDrawRectangle(wxCoord x, wxCoord y, wxCoord width, wxCoord height)
 
 void wxDC::DoDrawRoundedRectangle(wxCoord x, wxCoord y, wxCoord width, wxCoord height, double radius)
 {
 
 void wxDC::DoDrawRoundedRectangle(wxCoord x, wxCoord y, wxCoord width, wxCoord height, double radius)
 {

+    WXMICROWIN_CHECK_HDC
+

     wxColourChanger cc(*this); // needed for wxSTIPPLE_MASK_OPAQUE handling
 
     // Now, a negative radius value is interpreted to mean
     wxColourChanger cc(*this); // needed for wxSTIPPLE_MASK_OPAQUE handling
 
     // Now, a negative radius value is interpreted to mean


@@ -633,11 +934,7 @@ void wxDC::DoDrawRoundedRectangle(wxCoord x, wxCoord y, wxCoord width, wxCoord h
 
     if (radius < 0.0)
     {
 
     if (radius < 0.0)
     {

-        double smallest = 0.0;
-        if (width < height)
-            smallest = width;
-        else
-            smallest = height;
+        double smallest = (width < height) ? width : height;

         radius = (- radius * smallest);
     }
 
         radius = (- radius * smallest);
     }
 


@@ -662,6 +959,8 @@ void wxDC::DoDrawRoundedRectangle(wxCoord x, wxCoord y, wxCoord width, wxCoord h
 
 void wxDC::DoDrawEllipse(wxCoord x, wxCoord y, wxCoord width, wxCoord height)
 {
 
 void wxDC::DoDrawEllipse(wxCoord x, wxCoord y, wxCoord width, wxCoord height)
 {

+    WXMICROWIN_CHECK_HDC
+

     wxColourChanger cc(*this); // needed for wxSTIPPLE_MASK_OPAQUE handling
 
     wxCoord x2 = (x+width);
     wxColourChanger cc(*this); // needed for wxSTIPPLE_MASK_OPAQUE handling
 
     wxCoord x2 = (x+width);


@@ -676,6 +975,12 @@ void wxDC::DoDrawEllipse(wxCoord x, wxCoord y, wxCoord width, wxCoord height)
 // 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)
 {
 // 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)
 {

+#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;
     wxColourChanger cc(*this); // needed for wxSTIPPLE_MASK_OPAQUE handling
 
     wxCoord x2 = x + w;


@@ -715,10 +1020,13 @@ void wxDC::DoDrawEllipticArc(wxCoord x,wxCoord y,wxCoord w,wxCoord h,double sa,d
 
     CalcBoundingBox(x, y);
     CalcBoundingBox(x2, y2);
 
     CalcBoundingBox(x, y);
     CalcBoundingBox(x2, y2);

+#endif

 }
 
 void wxDC::DoDrawIcon(const wxIcon& icon, wxCoord x, wxCoord y)
 {
 }
 
 void wxDC::DoDrawIcon(const wxIcon& icon, wxCoord x, wxCoord y)
 {

+    WXMICROWIN_CHECK_HDC
+

     wxCHECK_RET( icon.Ok(), wxT("invalid icon in DrawIcon") );
 
 #ifdef __WIN32__
     wxCHECK_RET( icon.Ok(), wxT("invalid icon in DrawIcon") );
 
 #ifdef __WIN32__


@@ -733,6 +1041,8 @@ void wxDC::DoDrawIcon(const wxIcon& icon, wxCoord x, wxCoord y)
 
 void wxDC::DoDrawBitmap( const wxBitmap &bmp, wxCoord x, wxCoord y, bool useMask )
 {
 
 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(),
     wxCHECK_RET( bmp.Ok(), _T("invalid bitmap in wxDC::DrawBitmap") );
 
     int width = bmp.GetWidth(),


@@ -740,6 +1050,19 @@ void wxDC::DoDrawBitmap( const wxBitmap &bmp, wxCoord x, wxCoord y, bool useMask
 
     HBITMAP hbmpMask = 0;
 
 
     HBITMAP hbmpMask = 0;
 

+#if wxUSE_PALETTE
+    HPALETTE oldPal = 0;
+#endif // wxUSE_PALETTE
+
+    if ( bmp.HasAlpha() )
+    {
+        MemoryHDC hdcMem;
+        SelectInHDC select(hdcMem, GetHbitmapOf(bmp));
+
+        if ( AlphaBlt(GetHdc(), x, y, width, height, hdcMem, bmp) )
+            return;
+    }
+

     if ( useMask )
     {
         wxMask *mask = bmp.GetMask();
     if ( useMask )
     {
         wxMask *mask = bmp.GetMask();


@@ -750,23 +1073,47 @@ void wxDC::DoDrawBitmap( const wxBitmap &bmp, wxCoord x, wxCoord y, bool useMask
         {
             // don't give assert here because this would break existing
             // programs - just silently ignore useMask parameter
         {
             // don't give assert here because this would break existing
             // programs - just silently ignore useMask parameter

-            useMask = FALSE;
+            useMask = false;

         }
     }
         }
     }

-

     if ( useMask )
     {
 #ifdef __WIN32__
     if ( useMask )
     {
 #ifdef __WIN32__

-        HDC hdcMem = ::CreateCompatibleDC(GetHdc());
-        ::SelectObject(hdcMem, GetHbitmapOf(bmp));
-

         // use MaskBlt() with ROP which doesn't do anything to dst in the mask
         // points
         // use MaskBlt() with ROP which doesn't do anything to dst in the mask
         // points

-        bool ok = ::MaskBlt(GetHdc(), x, y, width, height,
+        // 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;
                             hdcMem, 0, 0,
                             hbmpMask, 0, 0,
                             MAKEROP4(SRCCOPY, DSTCOPY)) != 0;

-        ::DeleteDC(hdcMem);
+
+#if wxUSE_PALETTE
+            if (oldPal)
+                ::SelectPalette(hdcMem, oldPal, FALSE);
+#endif // wxUSE_PALETTE
+
+            ::SelectObject(hdcMem, hOldBitmap);
+            ::DeleteDC(hdcMem);
+        }

 
         if ( !ok )
 #endif // Win32
 
         if ( !ok )
 #endif // Win32


@@ -800,8 +1147,24 @@ void wxDC::DoDrawBitmap( const wxBitmap &bmp, wxCoord x, wxCoord y, bool useMask
             ::SetBkColor(GetHdc(), m_textBackgroundColour.GetPixel() );
         }
 
             ::SetBkColor(GetHdc(), m_textBackgroundColour.GetPixel() );
         }
 

-        ::SelectObject( memdc, hbitmap );
+#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);
         ::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 );
 
         ::SetTextColor(GetHdc(), old_textground);
         ::DeleteDC( memdc );
 
         ::SetTextColor(GetHdc(), old_textground);


@@ -811,6 +1174,8 @@ void wxDC::DoDrawBitmap( const wxBitmap &bmp, wxCoord x, wxCoord y, bool useMask
 
 void wxDC::DoDrawText(const wxString& text, wxCoord x, wxCoord y)
 {
 
 void wxDC::DoDrawText(const wxString& text, wxCoord x, wxCoord y)
 {

+    WXMICROWIN_CHECK_HDC
+

     DrawAnyText(text, x, y);
 
     // update the bounding box
     DrawAnyText(text, x, y);
 
     // update the bounding box


@@ -823,6 +1188,8 @@ void wxDC::DoDrawText(const wxString& text, wxCoord x, wxCoord y)
 
 void wxDC::DrawAnyText(const wxString& text, wxCoord x, wxCoord y)
 {
 
 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());
     // prepare for drawing the text
     if ( m_textForegroundColour.Ok() )
         SetTextColor(GetHdc(), m_textForegroundColour.GetPixel());


@@ -836,11 +1203,19 @@ void wxDC::DrawAnyText(const wxString& text, wxCoord x, wxCoord y)
     SetBkMode(GetHdc(), m_backgroundMode == wxTRANSPARENT ? TRANSPARENT
                                                           : OPAQUE);
 
     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"));
     }
     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
 
     // restore the old parameters (text foreground colour may be left because
     // it never is set to anything else, but background should remain


@@ -855,6 +1230,8 @@ void wxDC::DoDrawRotatedText(const wxString& text,
                              wxCoord x, wxCoord y,
                              double angle)
 {
                              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
     // 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


@@ -863,11 +1240,13 @@ void wxDC::DoDrawRotatedText(const wxString& text,
     {
         DoDrawText(text, x, y);
     }
     {
         DoDrawText(text, x, y);
     }

+#ifndef __WXMICROWIN__

     else
     {
     else
     {

-        // NB: don't take DEFAULT_GUI_FONT because it's not TrueType and so
-        //     can't have non zero orientation/escapement
-        wxFont font = m_font.Ok() ? m_font : *wxNORMAL_FONT;
+        // 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 )
         HFONT hfont = (HFONT)font.GetResourceHandle();
         LOGFONT lf;
         if ( ::GetObject(hfont, sizeof(lf), &lf) == 0 )


@@ -905,222 +1284,238 @@ void wxDC::DoDrawRotatedText(const wxString& text,
 
         // "upper left" and "upper right"
         CalcBoundingBox(x, y);
 
         // "upper left" and "upper right"
         CalcBoundingBox(x, y);

-        CalcBoundingBox(x + w*cos(rad), y - h*sin(rad));
+        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);
 
         // "bottom left" and "bottom right"
         x += (wxCoord)(h*sin(rad));
         y += (wxCoord)(h*cos(rad));
         CalcBoundingBox(x, y);

-        CalcBoundingBox(x + h*sin(rad), y + h*cos(rad));
+        CalcBoundingBox(x + wxCoord(w*cos(rad)), y - wxCoord(w*sin(rad)));

     }
     }

+#endif

 }
 
 // ---------------------------------------------------------------------------
 // set GDI objects
 // ---------------------------------------------------------------------------
 
 }
 
 // ---------------------------------------------------------------------------
 // set GDI objects
 // ---------------------------------------------------------------------------
 

-void wxDC::SetPalette(const wxPalette& palette)
+#if wxUSE_PALETTE
+
+void wxDC::DoSelectPalette(bool realize)

 {
 {

+    WXMICROWIN_CHECK_HDC
+

     // Set the old object temporarily, in case the assignment deletes an object
     // that's not yet selected out.
     if (m_oldPalette)
     {
     // 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, TRUE);
+        ::SelectPalette(GetHdc(), (HPALETTE) m_oldPalette, FALSE);

         m_oldPalette = 0;
     }
 
         m_oldPalette = 0;
     }
 

-    m_palette = palette;
-
-    if (!m_palette.Ok())
+    if ( m_palette.Ok() )

     {
     {

-        // Setting a NULL colourmap is a way of restoring
-        // the original colourmap
-        if (m_oldPalette)
-        {
-            ::SelectPalette(GetHdc(), (HPALETTE) m_oldPalette, TRUE);
-            m_oldPalette = 0;
-        }
+        HPALETTE oldPal = ::SelectPalette(GetHdc(),
+                                          GetHpaletteOf(m_palette),
+                                          false);
+        if (!m_oldPalette)
+            m_oldPalette = (WXHPALETTE) oldPal;

 
 

-        return;
+        if (realize)
+            ::RealizePalette(GetHdc());

     }
     }

+}

 
 

-    if (m_palette.Ok() && m_palette.GetHPALETTE())
+void wxDC::SetPalette(const wxPalette& palette)
+{
+    if ( palette.Ok() )

     {
     {

-        HPALETTE oldPal = ::SelectPalette(GetHdc(), (HPALETTE) m_palette.GetHPALETTE(), TRUE);
-        if (!m_oldPalette)
-            m_oldPalette = (WXHPALETTE) oldPal;
-
-        ::RealizePalette(GetHdc());
+        m_palette = palette;
+        DoSelectPalette(true);

     }
 }
 
     }
 }
 

-void wxDC::SetFont(const wxFont& the_font)
+void wxDC::InitializePalette()

 {
 {

-    // Set the old object temporarily, in case the assignment deletes an object
-    // that's not yet selected out.
-    if (m_oldFont)
+    if ( wxDisplayDepth() <= 8 )

     {
     {

-        ::SelectObject(GetHdc(), (HFONT) m_oldFont);
-        m_oldFont = 0;
+        // 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();
+
+        m_hasCustomPalette = win && win->HasCustomPalette();
+        if ( m_hasCustomPalette )
+        {
+            m_palette = win->GetPalette();
+
+            // turn on MSW translation for this palette
+            DoSelectPalette();
+        }

     }
     }

+}
+
+#endif // wxUSE_PALETTE

 
 

-    m_font = the_font;
+// 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 (!the_font.Ok())
+    if ( font.Ok() )

     {
     {

-        if (m_oldFont)
-            ::SelectObject(GetHdc(), (HFONT) m_oldFont);
-        m_oldFont = 0;
-    }
+        HGDIOBJ hfont = ::SelectObject(GetHdc(), GetHfontOf(font));
+        if ( hfont == HGDI_ERROR )
+        {
+            wxLogLastError(_T("SelectObject(font)"));
+        }
+        else // selected ok
+        {
+            if ( !m_oldFont )
+                m_oldFont = (WXHPEN)hfont;

 
 

-    if (m_font.Ok() && m_font.GetResourceHandle())
+            m_font = font;
+        }
+    }
+    else // invalid font, reset the current font

     {
     {

-        HFONT f = (HFONT) ::SelectObject(GetHdc(), (HFONT) m_font.GetResourceHandle());
-        if (f == (HFONT) NULL)
+        if ( m_oldFont )

         {
         {

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

         }
         }

-        if (!m_oldFont)
-            m_oldFont = (WXHFONT) f;
+
+        m_font = wxNullFont;

     }
 }
 
 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(GetHdc(), (HPEN) m_oldPen);
-        m_oldPen = 0;
-    }
+    WXMICROWIN_CHECK_HDC

 
 

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

 
 

-    if (!m_pen.Ok())
+    if ( pen.Ok() )

     {
     {

-        if (m_oldPen)
-            ::SelectObject(GetHdc(), (HPEN) m_oldPen);
-        m_oldPen = 0;
-    }
+        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())
+            m_pen = pen;
+        }
+    }
+    else // invalid pen, reset the current pen

     {
     {

-        if (m_pen.GetResourceHandle())
+        if ( m_oldPen )

         {
         {

-            HPEN p = (HPEN) ::SelectObject(GetHdc(), (HPEN)m_pen.GetResourceHandle());
-            if (!m_oldPen)
-                m_oldPen = (WXHPEN) p;
+            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(GetHdc(), (HBRUSH) m_oldBrush);
-        m_oldBrush = 0;
-    }
-
-    m_brush = brush;
+    WXMICROWIN_CHECK_HDC

 
 

-    if (!m_brush.Ok())
-    {
-        if (m_oldBrush)
-            ::SelectObject(GetHdc(), (HBRUSH) m_oldBrush);
-        m_oldBrush = 0;
-    }
+    if ( brush == m_brush )
+        return;

 
 

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

     {
     {

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

         if ( stipple && stipple->Ok() )
         {
         if ( stipple && stipple->Ok() )
         {

-#ifdef __WIN32__
-               ::SetBrushOrgEx(GetHdc(),
-                            m_deviceOriginX % stipple->GetWidth(),
-                            m_deviceOriginY % stipple->GetHeight(),
-                            NULL);  // don't need previous brush origin
-#else
-               ::SetBrushOrg(GetHdc(),
-                            m_deviceOriginX % stipple->GetWidth(),
-                            m_deviceOriginY % stipple->GetHeight());
-#endif
+            if ( !::SetBrushOrgEx
+                    (
+                        GetHdc(),
+                        m_deviceOriginX % stipple->GetWidth(),
+                        m_deviceOriginY % stipple->GetHeight(),
+                        NULL                    // [out] previous brush origin
+                    ) )
+            {
+                wxLogLastError(_T("SetBrushOrgEx()"));
+            }

         }
 
         }
 

-        if ( m_brush.GetResourceHandle() )
+        HGDIOBJ hbrush = ::SelectObject(GetHdc(), GetHbrushOf(brush));
+        if ( hbrush == HGDI_ERROR )

         {
         {

-            HBRUSH b = 0;
-            b = (HBRUSH) ::SelectObject(GetHdc(), (HBRUSH)m_brush.GetResourceHandle());
-            if (!m_oldBrush)
-                m_oldBrush = (WXHBRUSH) b;
+            wxLogLastError(_T("SelectObject(brush)"));

         }
         }

-    }
-}
-
-void wxDC::SetBackground(const wxBrush& brush)
-{
-    m_backgroundBrush = brush;
-
-    if (!m_backgroundBrush.Ok())
-        return;
+        else // selected ok
+        {
+            if ( !m_oldBrush )
+                m_oldBrush = (WXHPEN)hbrush;

 
 

-    if (m_canvas)
+            m_brush = brush;
+        }
+    }
+    else // invalid brush, reset the current brush

     {
     {

-        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_oldBrush )

         {
         {

-            if (m_backgroundBrush.GetStyle()==wxTRANSPARENT)
-            {
-                m_canvas->SetTransparent(TRUE);
-            }
-            else
+            if ( ::SelectObject(GetHdc(), (HPEN) m_oldBrush) == HGDI_ERROR )

             {
             {

-                // New behaviour, 10/2/99: setting the background brush of a DC
-                // doesn't affect the window background colour. However,
-                // I'm leaving in the transparency setting because it's needed by
-                // various controls (e.g. wxStaticText) to determine whether to draw
-                // transparently or not. TODO: maybe this should be a new function
-                // wxWindow::SetTransparency(). Should that apply to the child itself, or the
-                // parent?
-                //        m_canvas->SetBackgroundColour(m_backgroundBrush.GetColour());
-                m_canvas->SetTransparent(FALSE);
+                wxLogLastError(_T("SelectObject(old brush)"));

             }
             }

+
+            m_oldBrush = 0;

         }
         }

+
+        m_brush = wxNullBrush;

     }
     }

-    COLORREF new_color = m_backgroundBrush.GetColour().GetPixel();
+}
+
+void wxDC::SetBackground(const wxBrush& brush)
+{
+    WXMICROWIN_CHECK_HDC
+
+    m_backgroundBrush = brush;
+
+    if ( m_backgroundBrush.Ok() )

     {
     {

-        (void)SetBkColor(GetHdc(), new_color);
+        (void)SetBkColor(GetHdc(), m_backgroundBrush.GetColour().GetPixel());

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

+    WXMICROWIN_CHECK_HDC
+

     m_backgroundMode = mode;
 
     // SetBackgroundColour now only refers to text background
     // and m_backgroundMode is used there
     m_backgroundMode = mode;
 
     // SetBackgroundColour now only refers to text background
     // and m_backgroundMode is used there

-
-/*
-    if (m_backgroundMode == wxTRANSPARENT)
-        ::SetBkMode(GetHdc(), TRANSPARENT);
-    else
-        ::SetBkMode(GetHdc(), OPAQUE);
-       Last change:  AC   29 Jan 101    8:54 pm
-*/

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

+    WXMICROWIN_CHECK_HDC
+

     m_logicalFunction = function;
 
     SetRop(m_hDC);
     m_logicalFunction = function;
 
     SetRop(m_hDC);


@@ -1160,10 +1555,10 @@ void wxDC::SetRop(WXHDC dc)
     SetROP2(GetHdc(), rop);
 }
 
     SetROP2(GetHdc(), rop);
 }
 

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

 {
 {

-    // We might be previewing, so return TRUE to let it continue.
-    return TRUE;
+    // We might be previewing, so return true to let it continue.
+    return true;

 }
 
 void wxDC::EndDoc()
 }
 
 void wxDC::EndDoc()


@@ -1184,148 +1579,265 @@ void wxDC::EndPage()
 
 wxCoord wxDC::GetCharHeight() const
 {
 
 wxCoord wxDC::GetCharHeight() const
 {

+    WXMICROWIN_CHECK_HDC_RET(0)
+

     TEXTMETRIC lpTextMetric;
 
     GetTextMetrics(GetHdc(), &lpTextMetric);
 
     TEXTMETRIC lpTextMetric;
 
     GetTextMetrics(GetHdc(), &lpTextMetric);
 

-    return YDEV2LOGREL(lpTextMetric.tmHeight);
+    return lpTextMetric.tmHeight;

 }
 
 wxCoord wxDC::GetCharWidth() const
 {
 }
 
 wxCoord wxDC::GetCharWidth() const
 {

+    WXMICROWIN_CHECK_HDC_RET(0)
+

     TEXTMETRIC lpTextMetric;
 
     GetTextMetrics(GetHdc(), &lpTextMetric);
 
     TEXTMETRIC lpTextMetric;
 
     GetTextMetrics(GetHdc(), &lpTextMetric);
 

-    return XDEV2LOGREL(lpTextMetric.tmAveCharWidth);
+    return lpTextMetric.tmAveCharWidth;

 }
 
 void wxDC::DoGetTextExtent(const wxString& string, wxCoord *x, wxCoord *y,
                            wxCoord *descent, wxCoord *externalLeading,
 }
 
 void wxDC::DoGetTextExtent(const wxString& string, wxCoord *x, wxCoord *y,
                            wxCoord *descent, wxCoord *externalLeading,

-                           wxFont *theFont) const
+                           wxFont *font) const

 {
 {

-    wxFont *fontToUse = (wxFont*) theFont;
-    if (!fontToUse)
-        fontToUse = (wxFont*) &m_font;
+#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;
     TEXTMETRIC tm;
 
 
     SIZE sizeRect;
     TEXTMETRIC tm;
 

-    GetTextExtentPoint(GetHdc(), WXSTRINGCAST string, wxStrlen(WXSTRINGCAST string), &sizeRect);
+    GetTextExtentPoint(GetHdc(), string, string.length(), &sizeRect);

     GetTextMetrics(GetHdc(), &tm);
 
     GetTextMetrics(GetHdc(), &tm);
 

-    if (x) *x = XDEV2LOGREL(sizeRect.cx);
-    if (y) *y = YDEV2LOGREL(sizeRect.cy);
-    if (descent) *descent = tm.tmDescent;
-    if (externalLeading) *externalLeading = tm.tmExternalLeading;
+    if (x)
+        *x = sizeRect.cx;
+    if (y)
+        *y = sizeRect.cy;
+    if (descent)
+        *descent = tm.tmDescent;
+    if (externalLeading)
+        *externalLeading = tm.tmExternalLeading;
+
+    if ( hfontOld )
+    {
+        ::SelectObject(GetHdc(), hfontOld);
+    }

 }
 
 }
 

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

 
 

-    int pixel_width = 0;
-    int pixel_height = 0;
-    int mm_width = 0;
-    int mm_height = 0;
+// Each element of the array will be the width of the string up to and
+// including the coresoponding character in text.
+
+bool wxDC::DoGetPartialTextExtents(const wxString& text, wxArrayInt& widths) const
+{
+    static int maxLenText = -1;
+    static int maxWidth = -1;
+    int fit = 0;
+    SIZE sz = {0,0};
+    int stlen = text.Length();

 
 

-    pixel_width = GetDeviceCaps(GetHdc(), HORZRES);
-    pixel_height = GetDeviceCaps(GetHdc(), VERTRES);
-    mm_width = GetDeviceCaps(GetHdc(), HORZSIZE);
-    mm_height = GetDeviceCaps(GetHdc(), VERTSIZE);
+    if (maxLenText == -1)
+    {
+        // Win9x and WinNT+ have different limits
+        int version = wxGetOsVersion();
+        maxLenText = version == wxWINDOWS_NT ? 65535 : 8192;
+        maxWidth =   version == wxWINDOWS_NT ? INT_MAX : 32767;
+    }

 
 

-    if ((pixel_width == 0) || (pixel_height == 0) || (mm_width == 0) || (mm_height == 0))
+    widths.Empty();
+    widths.Add(0, stlen);  // fill the array with zeros
+
+    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))

     {
     {

-        return;
+        // API failed
+        wxLogLastError(wxT("GetTextExtentExPoint"));
+        return false;

     }
 
     }
 

-    double mm2pixelsX = pixel_width/mm_width;
-    double mm2pixelsY = pixel_height/mm_height;
+    return true;
+}
+
+
+
+
+void wxDC::SetMapMode(int mode)
+{
+    WXMICROWIN_CHECK_HDC
+
+    m_mappingMode = mode;

 
 

-    switch (mode)
+    if ( mode == wxMM_TEXT )

     {
     {

-    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 =
+        m_logicalScaleY = 1.0;
+    }
+    else // need to do some calculations
+    {
+        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) )

         {
         {

-            m_logicalScaleX = (mm2pixelsX/10.0);
-            m_logicalScaleY = (mm2pixelsY/10.0);
-            break;
+            // we can't calculate mm2pixels[XY] then!
+            return;

         }
         }

-    default:
-    case wxMM_TEXT:
+
+        double mm2pixelsX = (double)pixel_width / mm_width,
+               mm2pixelsY = (double)pixel_height / mm_height;
+
+        switch (mode)

         {
         {

-            m_logicalScaleX = 1.0;
-            m_logicalScaleY = 1.0;
-            break;
+            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(GetHdc()) != MM_ANISOTROPIC)
-        ::SetMapMode(GetHdc(), 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);

 
 

-    SetViewportExtEx(GetHdc(), VIEWPORT_EXTENT, VIEWPORT_EXTENT, NULL);
-    m_windowExtX = (int)MS_XDEV2LOGREL(VIEWPORT_EXTENT);
-    m_windowExtY = (int)MS_YDEV2LOGREL(VIEWPORT_EXTENT);
-    ::SetWindowExtEx(GetHdc(), m_windowExtX, m_windowExtY, NULL);
-    ::SetViewportOrgEx(GetHdc(), (int)m_deviceOriginX, (int)m_deviceOriginY, NULL);
-    ::SetWindowOrgEx(GetHdc(), (int)m_logicalOriginX, (int)m_logicalOriginY, NULL);
+    int width = DeviceToLogicalXRel(VIEWPORT_EXTENT)*m_signX,
+        height = DeviceToLogicalYRel(VIEWPORT_EXTENT)*m_signY;
+
+    ::SetViewportExtEx(GetHdc(), VIEWPORT_EXTENT, VIEWPORT_EXTENT, NULL);
+    ::SetWindowExtEx(GetHdc(), width, height, NULL);
+
+    ::SetViewportOrgEx(GetHdc(), m_deviceOriginX, m_deviceOriginY, NULL);
+    ::SetWindowOrgEx(GetHdc(), m_logicalOriginX, m_logicalOriginY, NULL);
+#endif

 }
 
 void wxDC::SetUserScale(double x, double y)
 {
 }
 
 void wxDC::SetUserScale(double x, double y)
 {

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

     m_userScaleX = x;
     m_userScaleY = y;
 
     m_userScaleX = x;
     m_userScaleY = y;
 

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

 }
 
 void wxDC::SetAxisOrientation(bool xLeftRight, bool yBottomUp)
 {
 }
 
 void wxDC::SetAxisOrientation(bool xLeftRight, bool yBottomUp)
 {

-    m_signX = xLeftRight ? 1 : -1;
-    m_signY = yBottomUp ? -1 : 1;
+    WXMICROWIN_CHECK_HDC

 
 

-    SetMapMode(m_mappingMode);
+#ifndef __WXWINCE__
+    int signX = xLeftRight ? 1 : -1,
+        signY = yBottomUp ? -1 : 1;
+
+    if ( signX != m_signX || signY != m_signY )
+    {
+        m_signX = signX;
+        m_signY = signY;
+
+        SetMapMode(m_mappingMode);
+    }
+#else
+    wxUnusedVar(xLeftRight);
+    wxUnusedVar(yBottomUp);
+#endif

 }
 
 void wxDC::SetSystemScale(double x, double y)
 {
 }
 
 void wxDC::SetSystemScale(double x, double y)
 {

+    WXMICROWIN_CHECK_HDC
+
+    if ( x == m_scaleX && y == m_scaleY )
+        return;
+

     m_scaleX = x;
     m_scaleY = y;
 
     m_scaleX = x;
     m_scaleY = y;
 

+#ifndef __WXWINCE__

     SetMapMode(m_mappingMode);
     SetMapMode(m_mappingMode);

+#endif

 }
 
 void wxDC::SetLogicalOrigin(wxCoord x, wxCoord y)
 {
 }
 
 void wxDC::SetLogicalOrigin(wxCoord x, wxCoord y)
 {

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

     m_logicalOriginX = x;
     m_logicalOriginY = y;
 
     m_logicalOriginX = x;
     m_logicalOriginY = y;
 

+#ifndef __WXWINCE__

     ::SetWindowOrgEx(GetHdc(), (int)m_logicalOriginX, (int)m_logicalOriginY, NULL);
     ::SetWindowOrgEx(GetHdc(), (int)m_logicalOriginX, (int)m_logicalOriginY, NULL);

+#endif

 }
 
 void wxDC::SetDeviceOrigin(wxCoord x, wxCoord y)
 {
 }
 
 void wxDC::SetDeviceOrigin(wxCoord x, wxCoord y)
 {

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

     m_deviceOriginX = x;
     m_deviceOriginY = y;
 
     m_deviceOriginX = x;
     m_deviceOriginY = y;
 

+#ifndef __WXWINCE__

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

+#endif

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


@@ -1334,46 +1846,46 @@ void wxDC::SetDeviceOrigin(wxCoord x, wxCoord y)
 
 wxCoord wxDCBase::DeviceToLogicalX(wxCoord x) const
 {
 
 wxCoord wxDCBase::DeviceToLogicalX(wxCoord x) const
 {

-    double xRel = x - m_deviceOriginX;
-    xRel /= m_logicalScaleX*m_userScaleX*m_signX*m_scaleX;
-    return (wxCoord)(xRel + m_logicalOriginX);
+    return DeviceToLogicalXRel(x - m_deviceOriginX)*m_signX + m_logicalOriginX;

 }
 
 wxCoord wxDCBase::DeviceToLogicalXRel(wxCoord x) const
 {
 }
 
 wxCoord wxDCBase::DeviceToLogicalXRel(wxCoord x) const
 {

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

 }
 
 wxCoord wxDCBase::DeviceToLogicalY(wxCoord y) const
 {
 }
 
 wxCoord wxDCBase::DeviceToLogicalY(wxCoord y) const
 {

-    double yRel = y - m_deviceOriginY;
-    yRel /= m_logicalScaleY*m_userScaleY*m_signY*m_scaleY;
-    return (wxCoord)(yRel + m_logicalOriginY);
+    return DeviceToLogicalYRel(y - m_deviceOriginY)*m_signY + m_logicalOriginY;

 }
 
 wxCoord wxDCBase::DeviceToLogicalYRel(wxCoord y) const
 {
 }
 
 wxCoord wxDCBase::DeviceToLogicalYRel(wxCoord y) const
 {

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

 }
 
 wxCoord wxDCBase::LogicalToDeviceX(wxCoord x) const
 {
 }
 
 wxCoord wxDCBase::LogicalToDeviceX(wxCoord x) const
 {

-    return (wxCoord) ((x - m_logicalOriginX)*m_logicalScaleX*m_userScaleX*m_signX*m_scaleX + m_deviceOriginX);
+    return LogicalToDeviceXRel(x - m_logicalOriginX)*m_signX + m_deviceOriginX;

 }
 
 wxCoord wxDCBase::LogicalToDeviceXRel(wxCoord x) const
 {
 }
 
 wxCoord wxDCBase::LogicalToDeviceXRel(wxCoord x) const
 {

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

 }
 
 wxCoord wxDCBase::LogicalToDeviceY(wxCoord y) const
 {
 }
 
 wxCoord wxDCBase::LogicalToDeviceY(wxCoord y) const
 {

-    return (wxCoord) ((y - m_logicalOriginY)*m_logicalScaleY*m_userScaleY*m_signY*m_scaleY + m_deviceOriginY);
+    return LogicalToDeviceYRel(y - m_logicalOriginY)*m_signY + m_deviceOriginY;

 }
 
 wxCoord wxDCBase::LogicalToDeviceYRel(wxCoord y) const
 {
 }
 
 wxCoord wxDCBase::LogicalToDeviceYRel(wxCoord y) const
 {

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

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


@@ -1383,22 +1895,42 @@ wxCoord wxDCBase::LogicalToDeviceYRel(wxCoord y) const
 bool wxDC::DoBlit(wxCoord xdest, wxCoord ydest,
                   wxCoord width, wxCoord height,
                   wxDC *source, wxCoord xsrc, wxCoord ysrc,
 bool wxDC::DoBlit(wxCoord xdest, wxCoord ydest,
                   wxCoord width, wxCoord height,
                   wxDC *source, wxCoord xsrc, wxCoord ysrc,

-                  int rop, bool useMask)
+                  int rop, bool useMask,
+                  wxCoord xsrcMask, wxCoord ysrcMask)

 {
 {

+    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,
+                      GetHdcOf(*source), bmpSrc) )
+            return true;
+    }
+

     wxMask *mask = NULL;
     if ( useMask )
     {
     wxMask *mask = NULL;
     if ( useMask )
     {

-        const wxBitmap& bmp = source->m_selectedBitmap;
-        mask = bmp.GetMask();
+        mask = bmpSrc.GetMask();

 
 

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

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

-            useMask = FALSE;
+            useMask = false;

         }
     }
 
         }
     }
 

+    if (xsrcMask == -1 && ysrcMask == -1)
+    {
+        xsrcMask = xsrc; ysrcMask = ysrc;
+    }
+

     COLORREF old_textground = ::GetTextColor(GetHdc());
     COLORREF old_background = ::GetBkColor(GetHdc());
     if (m_textForegroundColour.Ok())
     COLORREF old_textground = ::GetTextColor(GetHdc());
     COLORREF old_background = ::GetBkColor(GetHdc());
     if (m_textForegroundColour.Ok())


@@ -1410,7 +1942,7 @@ bool wxDC::DoBlit(wxCoord xdest, wxCoord ydest,
         ::SetBkColor(GetHdc(), m_textBackgroundColour.GetPixel() );
     }
 
         ::SetBkColor(GetHdc(), m_textBackgroundColour.GetPixel() );
     }
 

-    DWORD dwRop = SRCCOPY;
+    DWORD dwRop;

     switch (rop)
     {
         case wxXOR:          dwRop = SRCINVERT;        break;
     switch (rop)
     {
         case wxXOR:          dwRop = SRCINVERT;        break;


@@ -1431,10 +1963,10 @@ bool wxDC::DoBlit(wxCoord xdest, wxCoord ydest,
         case wxNOR:          dwRop = NOTSRCCOPY;       break;
         default:
            wxFAIL_MSG( wxT("unsupported logical function") );
         case wxNOR:          dwRop = NOTSRCCOPY;       break;
         default:
            wxFAIL_MSG( wxT("unsupported logical function") );

-           return FALSE;
+           return false;

     }
 
     }
 

-    bool success;
+    bool success = false;

 
     if (useMask)
     {
 
     if (useMask)
     {


@@ -1443,22 +1975,54 @@ bool wxDC::DoBlit(wxCoord xdest, wxCoord ydest,
         // 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)
         // 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)

-        success = ::MaskBlt(GetHdc(), xdest, ydest, width, height,
-                            GetHdcOf(*source), xsrc, ysrc,
-                            (HBITMAP)mask->GetMaskBitmap(), xsrc, ysrc,
-                            MAKEROP4(dwRop, DSTCOPY)) != 0;
+
+        // 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
+        {
+           success = ::MaskBlt
+                       (
+                            GetHdc(),
+                            xdest, ydest, width, height,
+                            GetHdcOf(*source),
+                            xsrc, ysrc,
+                            (HBITMAP)mask->GetMaskBitmap(),
+                            xsrcMask, ysrcMask,
+                            MAKEROP4(dwRop, DSTCOPY)
+                        ) != 0;
+        }

 
         if ( !success )
 #endif // Win32
         {
             // Blit bitmap with mask
 
         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(GetHdcOf(*source));
-            HDC dc_buffer = ::CreateCompatibleDC(GetHdc());
-            HBITMAP buffer_bmap = ::CreateCompatibleBitmap(GetHdc(), width, height);
-            ::SelectObject(dc_mask, (HBITMAP) mask->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
             if ( !::BitBlt(dc_buffer, 0, 0, (int)width, (int)height,
 
             // copy dest to buffer
             if ( !::BitBlt(dc_buffer, 0, 0, (int)width, (int)height,


@@ -1478,7 +2042,7 @@ bool wxDC::DoBlit(wxCoord xdest, wxCoord ydest,
             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,
             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, xsrc, ysrc, SRCAND) )
+                           dc_mask, xsrcMask, ysrcMask, SRCAND) )

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


@@ -1487,7 +2051,7 @@ bool wxDC::DoBlit(wxCoord xdest, wxCoord ydest,
             ::SetBkColor(GetHdc(), RGB(0, 0, 0));
             ::SetTextColor(GetHdc(), RGB(255, 255, 255));
             if ( !::BitBlt(GetHdc(), xdest, ydest, (int)width, (int)height,
             ::SetBkColor(GetHdc(), RGB(0, 0, 0));
             ::SetTextColor(GetHdc(), RGB(255, 255, 255));
             if ( !::BitBlt(GetHdc(), xdest, ydest, (int)width, (int)height,

-                           dc_mask, xsrc, ysrc, SRCAND) )
+                           dc_mask, xsrcMask, ysrcMask, SRCAND) )

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


@@ -1504,23 +2068,116 @@ bool wxDC::DoBlit(wxCoord xdest, wxCoord ydest,
             }
 
             // 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 // no mask, just BitBlt() it
     {
         }
     }
     else // no mask, just BitBlt() it
     {

-        success = ::BitBlt(GetHdc(), xdest, ydest,
-                           (int)width, (int)height,
-                           GetHdcOf(*source), xsrc, ysrc, dwRop) != 0;
+        // 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,
+                                     SRCCOPY
+                                     ) == (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__
+        {
+#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 ( !success )
         {

-            wxLogLastError(wxT("BitBlt"));
+            if ( !::BitBlt
+                    (
+                        GetHdc(),
+                        xdest, ydest,
+                        (int)width, (int)height,
+                        GetHdcOf(*source),
+                        xsrc, ysrc,
+                        dwRop
+                    ) )
+            {
+                wxLogLastError(_T("BitBlt"));
+            }
+            else
+            {
+                success = true;
+            }

         }
     }
         }
     }

+

     ::SetTextColor(GetHdc(), old_textground);
     ::SetBkColor(GetHdc(), old_background);
 
     ::SetTextColor(GetHdc(), old_textground);
     ::SetBkColor(GetHdc(), old_background);
 


@@ -1529,279 +2186,334 @@ bool wxDC::DoBlit(wxCoord xdest, wxCoord ydest,
 
 void wxDC::DoGetSize(int *w, int *h) const
 {
 
 void wxDC::DoGetSize(int *w, int *h) const
 {

+    WXMICROWIN_CHECK_HDC
+

     if ( w ) *w = ::GetDeviceCaps(GetHdc(), HORZRES);
     if ( h ) *h = ::GetDeviceCaps(GetHdc(), VERTRES);
 }
 
 void wxDC::DoGetSizeMM(int *w, int *h) const
 {
     if ( w ) *w = ::GetDeviceCaps(GetHdc(), HORZRES);
     if ( h ) *h = ::GetDeviceCaps(GetHdc(), VERTRES);
 }
 
 void wxDC::DoGetSizeMM(int *w, int *h) const
 {

-    if ( w ) *w = ::GetDeviceCaps(GetHdc(), HORZSIZE);
-    if ( h ) *h = ::GetDeviceCaps(GetHdc(), VERTSIZE);
+    WXMICROWIN_CHECK_HDC
+
+    // 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);
+
+    if ( w )
+    {
+        int wTotal = ::GetDeviceCaps(GetHdc(), HORZRES);
+
+        wxCHECK_RET( wTotal, _T("0 width device?") );
+
+        *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;
+    }

 }
 
 wxSize wxDC::GetPPI() const
 {
 }
 
 wxSize wxDC::GetPPI() const
 {

+    WXMICROWIN_CHECK_HDC_RET(wxSize(0,0))
+

     int x = ::GetDeviceCaps(GetHdc(), LOGPIXELSX);
     int y = ::GetDeviceCaps(GetHdc(), LOGPIXELSY);
 
     return wxSize(x, y);
 }
 
     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)
 {

+    WXMICROWIN_CHECK_HDC
+

     m_logicalScaleX = x;
     m_logicalScaleY = y;
 }
 
     m_logicalScaleX = x;
     m_logicalScaleY = y;
 }
 

-#if WXWIN_COMPATIBILITY
-void wxDC::DoGetTextExtent(const wxString& string, float *x, float *y,
-                         float *descent, float *externalLeading,
-                         wxFont *theFont, bool use16bit) const
-{
-    wxCoord x1, y1, descent1, externalLeading1;
-    GetTextExtent(string, & x1, & y1, & descent1, & externalLeading1, theFont, use16bit);
-    *x = x1; *y = y1;
-    if (descent)
-        *descent = descent1;
-    if (externalLeading)
-        *externalLeading = externalLeading1;
-}
-#endif
-
-// ---------------------------------------------------------------------------
-// spline drawing code
-// ---------------------------------------------------------------------------
-
-#if wxUSE_SPLINES
-
-class wxSpline: public wxObject
-{
-public:
-    int type;
-    wxList *points;
+// ----------------------------------------------------------------------------
+// DC caching
+// ----------------------------------------------------------------------------

 
 

-    wxSpline(wxList *list);
-    void DeletePoints();
+#if wxUSE_DC_CACHEING

 
 

-    // Doesn't delete points
-    ~wxSpline();
-};
-
-void wx_draw_open_spline(wxDC *dc, wxSpline *spline);
+/*
+ * 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
+ */

 
 

-void wx_quadratic_spline(double a1, double b1, double a2, double b2,
-                         double a3, double b3, double a4, double b4);
-void wx_clear_stack();
-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);
+wxList wxDC::sm_bitmapCache;
+wxList wxDC::sm_dcCache;

 
 

-void wxDC::DoDrawSpline(wxList *list)
+wxDCCacheEntry::wxDCCacheEntry(WXHBITMAP hBitmap, int w, int h, int depth)

 {
 {

-    wxSpline spline(list);
-
-    wx_draw_open_spline(this, &spline);
+    m_bitmap = hBitmap;
+    m_dc = 0;
+    m_width = w;
+    m_height = h;
+    m_depth = depth;

 }
 
 }
 

-wxList wx_spline_point_list;
-
-void wx_draw_open_spline(wxDC *dc, wxSpline *spline)
+wxDCCacheEntry::wxDCCacheEntry(WXHDC hDC, int depth)

 {
 {

-    wxPoint *p;
-    double           cx1, cy1, cx2, cy2, cx3, cy3, cx4, cy4;
-    double           x1, y1, x2, y2;
-
-    wxNode *node = spline->points->First();
-    p = (wxPoint *)node->Data();
-
-    x1 = p->x;
-    y1 = p->y;
-
-    node = node->Next();
-    p = (wxPoint *)node->Data();
-
-    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);
+    m_bitmap = 0;
+    m_dc = hDC;
+    m_width = 0;
+    m_height = 0;
+    m_depth = depth;
+}

 
 

-    wx_spline_add_point(x1, y1);
+wxDCCacheEntry::~wxDCCacheEntry()
+{
+    if (m_bitmap)
+        ::DeleteObject((HBITMAP) m_bitmap);
+    if (m_dc)
+        ::DeleteDC((HDC) m_dc);
+}

 
 

-    while ((node = node->Next()) != NULL)
+wxDCCacheEntry* wxDC::FindBitmapInCache(WXHDC dc, int w, int h)
+{
+    int depth = ::GetDeviceCaps((HDC) dc, PLANES) * ::GetDeviceCaps((HDC) dc, BITSPIXEL);
+    wxList::compatibility_iterator node = sm_bitmapCache.GetFirst();
+    while (node)

     {
     {

-        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;
+        wxDCCacheEntry* entry = (wxDCCacheEntry*) node->GetData();

 
 

-        wx_quadratic_spline(cx1, cy1, cx2, cy2, cx3, cy3, cx4, cy4);
+        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;
+        }

 
 

-        cx1 = cx4;
-        cy1 = cy4;
-        cx2 = (double)(cx1 + x2) / 2;
-        cy2 = (double)(cy1 + y2) / 2;
+        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;
+}

 
 

-    wx_spline_add_point((double)wx_round(cx1), (double)wx_round(cy1));
-    wx_spline_add_point(x2, y2);
+wxDCCacheEntry* wxDC::FindDCInCache(wxDCCacheEntry* notThis, WXHDC dc)
+{
+    int depth = ::GetDeviceCaps((HDC) dc, PLANES) * ::GetDeviceCaps((HDC) dc, BITSPIXEL);
+    wxList::compatibility_iterator node = sm_dcCache.GetFirst();
+    while (node)
+    {
+        wxDCCacheEntry* entry = (wxDCCacheEntry*) node->GetData();

 
 

-    wx_spline_draw_point_array(dc);
+        // Don't return the same one as we already have
+        if (!notThis || (notThis != entry))
+        {
+            if (entry->m_depth == depth)
+            {
+                return entry;
+            }
+        }

 
 

+        node = node->GetNext();
+    }
+    WXHDC hDC = (WXHDC) ::CreateCompatibleDC((HDC) dc);
+    if ( !hDC)
+    {
+        wxLogLastError(wxT("CreateCompatibleDC"));
+    }
+    wxDCCacheEntry* entry = new wxDCCacheEntry(hDC, depth);
+    AddToDCCache(entry);
+    return entry;

 }
 
 }
 

-/********************* CURVES FOR SPLINES *****************************
+void wxDC::AddToBitmapCache(wxDCCacheEntry* entry)
+{
+    sm_bitmapCache.Append(entry);
+}

 
 

-  The following spline drawing routine is from
+void wxDC::AddToDCCache(wxDCCacheEntry* entry)
+{
+    sm_dcCache.Append(entry);
+}

 
 

-    "An Algorithm for High-Speed Curve Generation"
-    by George Merrill Chaikin,
-    Computer Graphics and Image Processing, 3, Academic Press,
-    1974, 346-349.
+void wxDC::ClearCache()
+{
+    WX_CLEAR_LIST(wxList, sm_dcCache);
+    WX_CLEAR_LIST(wxList, sm_bitmapCache);
+}

 
 

-      and
+// Clean up cache at app exit
+class wxDCModule : public wxModule
+{
+public:
+    virtual bool OnInit() { return true; }
+    virtual void OnExit() { wxDC::ClearCache(); }

 
 

-        "On Chaikin's Algorithm" by R. F. Riesenfeld,
-        Computer Graphics and Image Processing, 4, Academic Press,
-        1975, 304-310.
+private:
+    DECLARE_DYNAMIC_CLASS(wxDCModule)
+};

 
 

-***********************************************************************/
+IMPLEMENT_DYNAMIC_CLASS(wxDCModule, wxModule)

 
 

-#define     half(z1, z2)    ((z1+z2)/2.0)
-#define     THRESHOLD   5
+#endif // wxUSE_DC_CACHEING

 
 

-/* iterative version */
+// ----------------------------------------------------------------------------
+// alpha channel support
+// ----------------------------------------------------------------------------

 
 

-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;
+static bool AlphaBlt(HDC hdcDst,
+                     int x, int y, int width, int height,
+                     HDC hdcSrc,
+                     const wxBitmap& bmp)
+{
+    wxASSERT_MSG( bmp.Ok() && bmp.HasAlpha(), _T("AlphaBlt(): invalid bitmap") );
+    wxASSERT_MSG( hdcDst && hdcSrc, _T("AlphaBlt(): invalid HDC") );
+
+    // 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);
+
+    // bitmaps can be drawn only from GUI thread so there is no need to
+    // protect this static variable from multiple threads
+    static bool s_triedToLoad = false;
+    static AlphaBlend_t pfnAlphaBlend = NULL;
+    if ( !s_triedToLoad )
+    {
+        s_triedToLoad = true;

 
 

-    wx_clear_stack();
-    wx_spline_push(a1, b1, a2, b2, a3, b3, a4, b4);
+        // don't give errors about the DLL being unavailable, we're
+        // prepared to handle this
+        wxLogNull nolog;

 
 

-    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);
+        wxDynamicLibrary dll(_T("msimg32.dll"));
+        if ( dll.IsLoaded() )
+        {
+            pfnAlphaBlend = (AlphaBlend_t)dll.GetSymbol(_T("AlphaBlend"));
+            if ( pfnAlphaBlend )
+            {
+                // we must keep the DLL loaded if we want to be able to
+                // call AlphaBlend() so just never unload it at all, not a
+                // big deal
+                dll.Detach();
+            }

         }
     }
         }
     }

-}

 
 

+    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, 0, 0, width, height,
+                           bf) )
+        {
+            // skip wxAlphaBlend() call below
+            return true;
+        }

 
 

-/* utilities used by spline drawing routines */
+        wxLogLastError(_T("AlphaBlend"));
+    }
+#endif // defined(AC_SRC_OVER)

 
 

+    // AlphaBlend() unavailable of failed: use our own (probably much slower)
+    // implementation
+#ifdef wxHAVE_RAW_BITMAP
+    wxAlphaBlend(hdcDst, x, y, width, height, bmp);

 
 

-typedef struct wx_spline_stack_struct {
-    double           x1, y1, x2, y2, x3, y3, x4, y4;
+    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

 }
 }

-Stack;

 
 

-#define         SPLINE_STACK_DEPTH             20
-static Stack    wx_spline_stack[SPLINE_STACK_DEPTH];
-static Stack   *wx_stack_top;
-static int      wx_stack_count;

 
 

-void wx_clear_stack()
-{
-    wx_stack_top = wx_spline_stack;
-    wx_stack_count = 0;
-}
+// wxAlphaBlend: our fallback if ::AlphaBlend() is unavailable
+#ifdef wxHAVE_RAW_BITMAP

 
 

-void wx_spline_push(double x1, double y1, double x2, double y2, double x3, double y3, double x4, double y4)
+static void
+wxAlphaBlend(HDC hdcDst, int xDst, int yDst, int w, int h, const wxBitmap& bmpSrc)

 {
 {

-    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++;
-}
+    // get the destination DC pixels
+    wxBitmap bmpDst(w, h, 32 /* force creating RGBA DIB */);
+    MemoryHDC hdcMem;
+    SelectInHDC select(hdcMem, GetHbitmapOf(bmpDst));

 
 

-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);
-}
+    if ( !::BitBlt(hdcMem, 0, 0, w, h, hdcDst, 0, 0, SRCCOPY) )
+    {
+        wxLogLastError(_T("BitBlt"));
+    }

 
 

-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;
-}
+    // combine them with the source bitmap using alpha
+    wxAlphaPixelData dataDst(bmpDst),
+                     dataSrc((wxBitmap &)bmpSrc);

 
 

-static void wx_spline_draw_point_array(wxDC *dc)
-{
-    dc->DrawLines(&wx_spline_point_list, 0, 0);
-    wxNode *node = wx_spline_point_list.First();
-    while (node)
+    wxCHECK_RET( dataDst && dataSrc,
+                    _T("failed to get raw data in wxAlphaBlend") );
+
+    wxAlphaPixelData::Iterator pDst(dataDst),
+                               pSrc(dataSrc);
+
+    for ( int y = 0; y < h; y++ )

     {
     {

-        wxPoint *point = (wxPoint *)node->Data();
-        delete point;
-        delete node;
-        node = wx_spline_point_list.First();
-    }
-}
+        wxAlphaPixelData::Iterator pDstRowStart = pDst,
+                                   pSrcRowStart = pSrc;

 
 

-wxSpline::wxSpline(wxList *list)
-{
-    points = list;
-}
+        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();

 
 

-wxSpline::~wxSpline()
-{
-}
+            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;

 
 

-void wxSpline::DeletePoints()
-{
-    for(wxNode *node = points->First(); node; node = points->First())
+            ++pDst;
+            ++pSrc;
+        }
+
+        pDst = pDstRowStart;
+        pSrc = pSrcRowStart;
+        pDst.OffsetY(dataDst, 1);
+        pSrc.OffsetY(dataSrc, 1);
+    }
+
+    // and finally blit them back to the destination DC
+    if ( !::BitBlt(hdcDst, xDst, yDst, w, h, hdcMem, 0, 0, SRCCOPY) )

     {
     {

-        wxPoint *point = (wxPoint *)node->Data();
-        delete point;
-        delete node;
+        wxLogLastError(_T("BitBlt"));

     }
     }

-    delete points;

 }
 
 }
 

-
-#endif // wxUSE_SPLINES
-
+#endif // #ifdef wxHAVE_RAW_BITMAP