Replaced /'s with \'s as BCC requires \'s for path names

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

diff --git a/src/msw/dc.cpp b/src/msw/dc.cpp
index b300d73dfe9adbcadade9697d833826630ee630c..721a1fb3c7562cd85ff0deb67d90a2083a320201 100644 (file)
--- a/src/msw/dc.cpp
+++ b/src/msw/dc.cpp
@@ -9,120 +9,210 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 

+// ===========================================================================
+// declarations
+// ===========================================================================
+
+// ---------------------------------------------------------------------------
+// headers
+// ---------------------------------------------------------------------------
+

 #ifdef __GNUG__
 #ifdef __GNUG__

-#pragma implementation "dc.h"
+    #pragma implementation "dc.h"

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

-#pragma hdrstop
+    #pragma hdrstop

 #endif
 
 #ifndef WX_PRECOMP
 #endif
 
 #ifndef WX_PRECOMP

-#include "wx/frame.h"
-#include "wx/dc.h"
-#include "wx/utils.h"
-#include "wx/dialog.h"
-#include "wx/app.h"
-#include "wx/bitmap.h"
-#include "wx/dcmemory.h"
+    #include "wx/window.h"
+    #include "wx/dc.h"
+    #include "wx/utils.h"
+    #include "wx/dialog.h"
+    #include "wx/app.h"
+    #include "wx/bitmap.h"
+    #include "wx/dcmemory.h"
+    #include "wx/log.h"
+    #include "wx/icon.h"

 #endif
 
 #endif
 

+#include "wx/sysopt.h"

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

-#include "wx/msw/private.h"
+#include "wx/module.h"

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

+#include "wx/msw/private.h" // needs to be before #include <commdlg.h>
+

 #if wxUSE_COMMON_DIALOGS
 #if wxUSE_COMMON_DIALOGS

-#include <commdlg.h>
+    #include <commdlg.h>

 #endif
 
 #ifndef __WIN32__
 #endif
 
 #ifndef __WIN32__

-#include <print.h>
+    #include <print.h>

 #endif
 
 #endif
 

-#ifdef DrawText
-#undef DrawText
-#endif
+IMPLEMENT_ABSTRACT_CLASS(wxDC, wxDCBase)

 
 

-#ifdef GetCharWidth
-#undef GetCharWidth
-#endif
+// ---------------------------------------------------------------------------
+// constants
+// ---------------------------------------------------------------------------

 
 

-#ifdef StartDoc
-#undef StartDoc
-#endif
+static const int VIEWPORT_EXTENT = 1000;

 
 

-#if !USE_SHARED_LIBRARY
-IMPLEMENT_ABSTRACT_CLASS(wxDC, wxObject)
-#endif
+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
+
+// ---------------------------------------------------------------------------
+// private functions
+// ---------------------------------------------------------------------------
+
+// convert degrees to radians
+static inline double DegToRad(double deg) { return (deg * M_PI) / 180.0; }
+
+// ----------------------------------------------------------------------------
+// private classes
+// ----------------------------------------------------------------------------
+
+// instead of duplicating the same code which sets and then restores text
+// colours in each wxDC method working with wxSTIPPLE_MASK_OPAQUE brushes,
+// encapsulate this in a small helper class
+
+// wxColourChanger: changes the text colours in the ctor if required and
+//                  restores them in the dtor
+class wxColourChanger
+{
+public:
+    wxColourChanger(wxDC& dc);
+   ~wxColourChanger();
+
+private:
+    wxDC& m_dc;
+
+    COLORREF m_colFgOld, m_colBgOld;
+
+    bool m_changed;
+};
+
+// ===========================================================================
+// implementation
+// ===========================================================================
+
+// ----------------------------------------------------------------------------
+// wxColourChanger
+// ----------------------------------------------------------------------------
+
+wxColourChanger::wxColourChanger(wxDC& dc) : m_dc(dc)
+{
+    if ( dc.GetBrush().GetStyle() == wxSTIPPLE_MASK_OPAQUE )
+    {
+        HDC hdc = GetHdcOf(dc);
+        m_colFgOld = ::GetTextColor(hdc);
+        m_colBgOld = ::GetBkColor(hdc);
+
+        // note that Windows convention is opposite to wxWindows one, this is
+        // why text colour becomes the background one and vice versa
+        const wxColour& colFg = dc.GetTextForeground();
+        if ( colFg.Ok() )
+        {
+            ::SetBkColor(hdc, colFg.GetPixel());
+        }
+
+        const wxColour& colBg = dc.GetTextBackground();
+        if ( colBg.Ok() )
+        {
+            ::SetTextColor(hdc, colBg.GetPixel());
+        }
+
+        SetBkMode(hdc,
+                  dc.GetBackgroundMode() == wxTRANSPARENT ? TRANSPARENT
+                                                          : OPAQUE);
+
+        // flag which telsl us to undo changes in the dtor
+        m_changed = TRUE;
+    }
+    else
+    {
+        // nothing done, nothing to undo
+        m_changed = FALSE;
+    }
+}

 
 

-// Declarations local to this file
+wxColourChanger::~wxColourChanger()
+{
+    if ( m_changed )
+    {
+        // restore the colours we changed
+        HDC hdc = GetHdcOf(m_dc);

 
 

-#define YSCALE(y) (yorigin - (y))
+        ::SetBkMode(hdc, TRANSPARENT);
+        ::SetTextColor(hdc, m_colFgOld);
+        ::SetBkColor(hdc, m_colBgOld);
+    }
+}

 
 

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

 
 // Default constructor
 
 // Default constructor

-wxDC::wxDC(void)
+wxDC::wxDC()

 {
 {

-    m_minX = 0; m_minY = 0; m_maxX = 0; m_maxY = 0;
-    m_clipping = FALSE;
-    

     m_canvas = NULL;
     m_canvas = NULL;

+

     m_oldBitmap = 0;
     m_oldPen = 0;
     m_oldBrush = 0;
     m_oldFont = 0;
     m_oldPalette = 0;
     m_oldBitmap = 0;
     m_oldPen = 0;
     m_oldBrush = 0;
     m_oldFont = 0;
     m_oldPalette = 0;

-    m_minX = 0; m_minY = 0; m_maxX = 0; m_maxY = 0;
-    m_logicalOriginX = 0;
-    m_logicalOriginY = 0;
-    m_deviceOriginX = 0;
-    m_deviceOriginY = 0;
-    m_logicalScaleX = 1.0;
-    m_logicalScaleY = 1.0;
-    m_userScaleX = 1.0;
-    m_userScaleY = 1.0;
-    m_signX = 1;
-    m_signY = 1;
-    m_systemScaleX = 1.0;
-    m_systemScaleY = 1.0;
-    m_mappingMode = wxMM_TEXT;
+

     m_bOwnsDC = FALSE;
     m_hDC = 0;
     m_bOwnsDC = FALSE;
     m_hDC = 0;

-    m_clipping = FALSE;
-    m_ok = TRUE;
+

     m_windowExtX = VIEWPORT_EXTENT;
     m_windowExtY = VIEWPORT_EXTENT;
     m_windowExtX = VIEWPORT_EXTENT;
     m_windowExtY = VIEWPORT_EXTENT;

-    m_logicalFunction = -1;
-    
-    m_backgroundBrush = *wxWHITE_BRUSH;
-    
-    m_textForegroundColour = *wxBLACK;
-    m_textBackgroundColour = *wxWHITE;
-    
-    m_colour = wxColourDisplay();
-    
-    m_hDCCount = 0;

 }
 
 
 }
 
 

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

 {
 {

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

         SelectOldObjects(m_hDC);
         SelectOldObjects(m_hDC);

-        if ( m_bOwnsDC ) {
-            if ( m_canvas == NULL )
-                ::DeleteDC((HDC)m_hDC);
+
+        // if we own the HDC, we delete it, otherwise we just release it
+
+        if ( m_bOwnsDC )
+        {
+            ::DeleteDC(GetHdc());
+        }
+        else // we don't own our HDC
+        {
+            if (m_canvas)
+            {
+                ::ReleaseDC(GetHwndOf(m_canvas), GetHdc());
+            }

             else
             else

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


@@ -140,30 +230,30 @@ void wxDC::SelectOldObjects(WXHDC dc)
                 m_selectedBitmap.SetSelectedInto(NULL);
             }
         }
                 m_selectedBitmap.SetSelectedInto(NULL);
             }
         }

-        m_oldBitmap = 0 ;
+        m_oldBitmap = 0;

         if (m_oldPen)
         {
             ::SelectObject((HDC) dc, (HPEN) m_oldPen);
         }
         if (m_oldPen)
         {
             ::SelectObject((HDC) dc, (HPEN) m_oldPen);
         }

-        m_oldPen = 0 ;
+        m_oldPen = 0;

         if (m_oldBrush)
         {
             ::SelectObject((HDC) dc, (HBRUSH) m_oldBrush);
         }
         if (m_oldBrush)
         {
             ::SelectObject((HDC) dc, (HBRUSH) m_oldBrush);
         }

-        m_oldBrush = 0 ;
+        m_oldBrush = 0;

         if (m_oldFont)
         {
             ::SelectObject((HDC) dc, (HFONT) m_oldFont);
         }
         if (m_oldFont)
         {
             ::SelectObject((HDC) dc, (HFONT) m_oldFont);
         }

-        m_oldFont = 0 ;
+        m_oldFont = 0;

         if (m_oldPalette)
         {
             ::SelectPalette((HDC) dc, (HPALETTE) m_oldPalette, TRUE);
         }
         if (m_oldPalette)
         {
             ::SelectPalette((HDC) dc, (HPALETTE) m_oldPalette, TRUE);
         }

-        m_oldPalette = 0 ;
+        m_oldPalette = 0;

     }
     }

-    
-    m_brush = wxNullBrush ;
+
+    m_brush = wxNullBrush;

     m_pen = wxNullPen;
     m_palette = wxNullPalette;
     m_font = wxNullFont;
     m_pen = wxNullPen;
     m_palette = wxNullPalette;
     m_font = wxNullFont;


@@ -171,264 +261,370 @@ void wxDC::SelectOldObjects(WXHDC dc)
     m_selectedBitmap = wxNullBitmap;
 }
 
     m_selectedBitmap = wxNullBitmap;
 }
 

-void wxDC::SetClippingRegion(long cx, long cy, long cw, long ch)
+// ---------------------------------------------------------------------------
+// clipping
+// ---------------------------------------------------------------------------
+
+void wxDC::UpdateClipBox()

 {
 {

-    m_clipping = TRUE;
-    m_clipX1 = (int)cx;
-    m_clipY1 = (int)cy;
-    m_clipX2 = (int)(cx + cw);
-    m_clipY2 = (int)(cy + ch);
+#ifdef __WXMICROWIN__
+    if (!GetHDC()) return;
+#endif

     
     

-    DoClipping((WXHDC) m_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::SetClippingRegion(const wxRegion& region)
+void wxDC::DoSetClippingRegion(wxCoord x, wxCoord y, wxCoord w, wxCoord h)

 {
 {

-    if (!region.GetHRGN())
-        return;
-    
-    wxRect box = region.GetBox();
+#ifdef __WXMICROWIN__
+    if (!GetHDC()) return;
+#endif

     
     m_clipping = TRUE;
     
     m_clipping = TRUE;

-    m_clipX1 = box.x;
-    m_clipY1 = box.y;
-    m_clipX2 = box.x + box.width;
-    m_clipY2 = box.y + box.height;
-    
-#ifdef __WIN16__
-    SelectClipRgn((HDC) m_hDC, (HRGN) region.GetHRGN());
-#else
-    ExtSelectClipRgn((HDC) m_hDC, (HRGN) region.GetHRGN(), RGN_AND);
-#endif
-}

 
 

-void wxDC::DoClipping(WXHDC dc)
-{
-    if (m_clipping && dc)
+    // 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

     {
     {

-        IntersectClipRect((HDC) dc, XLOG2DEV(m_clipX1), YLOG2DEV(m_clipY1),
-            XLOG2DEV(m_clipX2), YLOG2DEV(m_clipY2));
+        if ( ::SelectClipRgn(GetHdc(), hrgn) == ERROR )
+        {
+            wxLogLastError(_T("SelectClipRgn"));
+        }
+        DeleteObject(hrgn);
+
+        UpdateClipBox();

     }
 }
 
     }
 }
 

-void wxDC::DestroyClippingRegion(void)
+void wxDC::DoSetClippingRegionAsRegion(const wxRegion& region)
+{
+#ifdef __WXMICROWIN__
+    if (!GetHDC()) return;
+#endif
+    
+    wxCHECK_RET( GetHrgnOf(region), wxT("invalid clipping region") );
+
+    m_clipping = TRUE;
+
+#ifdef __WIN16__
+    SelectClipRgn(GetHdc(), GetHrgnOf(region));
+#else // Win32
+    ExtSelectClipRgn(GetHdc(), GetHrgnOf(region), RGN_AND);
+#endif // Win16/32
+
+    UpdateClipBox();
+}
+
+void wxDC::DestroyClippingRegion()

 {
 {

+#ifdef __WXMICROWIN__
+    if (!GetHDC()) return;
+#endif
+    

     if (m_clipping && m_hDC)
     {
         // TODO: this should restore the previous clipping region,
         // so that OnPaint processing works correctly, and the update clipping region
         // doesn't get destroyed after the first DestroyClippingRegion.
         HRGN rgn = CreateRectRgn(0, 0, 32000, 32000);
     if (m_clipping && m_hDC)
     {
         // TODO: this should restore the previous clipping region,
         // so that OnPaint processing works correctly, and the update clipping region
         // doesn't get destroyed after the first DestroyClippingRegion.
         HRGN rgn = CreateRectRgn(0, 0, 32000, 32000);

-        SelectClipRgn((HDC) m_hDC, rgn);
+        SelectClipRgn(GetHdc(), rgn);

         DeleteObject(rgn);
     }
         DeleteObject(rgn);
     }

+

     m_clipping = FALSE;
 }
 
     m_clipping = FALSE;
 }
 

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

 {
     return TRUE;
 }
 
 {
     return TRUE;
 }
 

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

 {
 {

+#ifdef __WXMICROWIN__
+    // TODO Extend MicroWindows' GetDeviceCaps function
+    return TRUE;
+#else

     // What sort of display is it?
     // What sort of display is it?

-    int technology = ::GetDeviceCaps((HDC) m_hDC, TECHNOLOGY);
-    
-    bool ok;
-    
-    if (technology != DT_RASDISPLAY && technology != DT_RASPRINTER)
-        ok = FALSE;
-    else ok = TRUE;
-    
-    return ok;
+    int technology = ::GetDeviceCaps(GetHdc(), TECHNOLOGY);
+
+    return (technology == DT_RASDISPLAY) || (technology == DT_RASPRINTER);
+#endif

 }
 
 }
 

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

 {
 {

-    // Set the old object temporarily, in case the assignment deletes an object
-    // that's not yet selected out.
-    if (m_oldPalette)
-    {
-        ::SelectPalette((HDC) m_hDC, (HPALETTE) m_oldPalette, TRUE);
-        m_oldPalette = 0;
-    }
-    
-    m_palette = palette;
-    
-    if (!m_palette.Ok())
-    {
-        // Setting a NULL colourmap is a way of restoring
-        // the original colourmap
-        if (m_oldPalette)
-        {
-            ::SelectPalette((HDC) m_hDC, (HPALETTE) m_oldPalette, TRUE);
-            m_oldPalette = 0;
-        }
-        
-        return;
-    }
+#ifdef __WXMICROWIN__
+    if (!GetHDC()) return 16;
+#endif

     
     

-    if (m_palette.Ok() && m_palette.GetHPALETTE())
-    {
-        HPALETTE oldPal = ::SelectPalette((HDC) m_hDC, (HPALETTE) m_palette.GetHPALETTE(), TRUE);
-        if (!m_oldPalette)
-            m_oldPalette = (WXHPALETTE) oldPal;
-        
-        ::RealizePalette((HDC) m_hDC);
-    }
+    return (int)::GetDeviceCaps(GetHdc(), BITSPIXEL);

 }
 
 }
 

-void wxDC::Clear(void)
+// ---------------------------------------------------------------------------
+// drawing
+// ---------------------------------------------------------------------------
+
+void wxDC::Clear()

 {
 {

+#ifdef __WXMICROWIN__
+    if (!GetHDC()) return;
+#endif
+    

     RECT rect;
     RECT rect;

-    if (m_canvas)
+    if ( m_canvas )
+    {

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

-    else if (m_selectedBitmap.Ok())
+    }
+    else

     {
     {

+        // No, I think we should simply ignore this if printing on e.g.
+        // a printer DC.
+        // wxCHECK_RET( m_selectedBitmap.Ok(), wxT("this DC can't be cleared") );
+        if (!m_selectedBitmap.Ok())
+            return;
+

         rect.left = 0; rect.top = 0;
         rect.right = m_selectedBitmap.GetWidth();
         rect.bottom = m_selectedBitmap.GetHeight();
     }
         rect.left = 0; rect.top = 0;
         rect.right = m_selectedBitmap.GetWidth();
         rect.bottom = m_selectedBitmap.GetHeight();
     }

-    (void) ::SetMapMode((HDC) m_hDC, MM_TEXT);
-    
-    DWORD colour = GetBkColor((HDC) m_hDC);
+
+    (void) ::SetMapMode(GetHdc(), MM_TEXT);
+
+    DWORD colour = GetBkColor(GetHdc());

     HBRUSH brush = CreateSolidBrush(colour);
     HBRUSH brush = CreateSolidBrush(colour);

-    FillRect((HDC) m_hDC, &rect, brush);
+    FillRect(GetHdc(), &rect, brush);

     DeleteObject(brush);
     DeleteObject(brush);

-    
-    ::SetMapMode((HDC) m_hDC, MM_ANISOTROPIC);
-    ::SetViewportExtEx((HDC) m_hDC, VIEWPORT_EXTENT, VIEWPORT_EXTENT, NULL);
-    ::SetWindowExtEx((HDC) m_hDC, m_windowExtX, m_windowExtY, NULL);
-    ::SetViewportOrgEx((HDC) m_hDC, (int)m_deviceOriginX, (int)m_deviceOriginY, NULL);
-    ::SetWindowOrgEx((HDC) m_hDC, (int)m_logicalOriginX, (int)m_logicalOriginY, NULL);
+
+    ::SetMapMode(GetHdc(), MM_ANISOTROPIC);
+    ::SetViewportExtEx(GetHdc(), VIEWPORT_EXTENT, VIEWPORT_EXTENT, NULL);
+    ::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);

 }
 
 }
 

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

 {
 {

-    (void)ExtFloodFill((HDC) m_hDC, XLOG2DEV(x), YLOG2DEV(y),
-        col.GetPixel(),
-        style==wxFLOOD_SURFACE?
-FLOODFILLSURFACE:FLOODFILLBORDER
-                 );
+#ifdef __WXMICROWIN__
+    if (!GetHDC()) return;
+#endif

     
     

+    if ( !::ExtFloodFill(GetHdc(), XLOG2DEV(x), YLOG2DEV(y),
+                         col.GetPixel(),
+                         style == wxFLOOD_SURFACE ? FLOODFILLSURFACE
+                                                  : FLOODFILLBORDER) )
+    {
+        // quoting from the MSDN docs:
+        //
+        //      Following are some of the reasons this function might fail:
+        //
+        //      * The filling could not be completed.
+        //      * The specified point has the boundary color specified by the
+        //        crColor parameter (if FLOODFILLBORDER was requested).
+        //      * The specified point does not have the color specified by
+        //        crColor (if FLOODFILLSURFACE was requested)
+        //      * The point is outside the clipping region that is, it is not
+        //        visible on the device.
+        //
+        wxLogLastError(wxT("ExtFloodFill"));
+    }
+

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

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

 {
 {

-    // added by steve 29.12.94 (copied from DrawPoint)
-    // returns TRUE for pixels in the color of the current pen
-    // and FALSE for all other pixels colors
-    // if col is non-NULL return the color of the pixel
+#ifdef __WXMICROWIN__
+    if (!GetHDC()) return FALSE;
+#endif

     
     

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

     // get the color of the pixel
     // get the color of the pixel

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

 }
 
 }
 

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

 {
 {

-    // We suppose that our screen is 2000x2000 max.
-    long x1 = x-2000;
-    long y1 = y-2000;
-    long x2 = x+2000;
-    long y2 = y+2000;
-    
-    (void)MoveToEx((HDC) m_hDC, XLOG2DEV(x1), YLOG2DEV(y), NULL);
-    (void)LineTo((HDC) m_hDC, XLOG2DEV(x2), YLOG2DEV(y));
-    
-    (void)MoveToEx((HDC) m_hDC, XLOG2DEV(x), YLOG2DEV(y1), NULL);
-    (void)LineTo((HDC) m_hDC, XLOG2DEV(x), YLOG2DEV(y2));
+#ifdef __WXMICROWIN__
+    if (!GetHDC()) return;
+#endif

     
     

+    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));
+

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

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

 {
 {

-    (void)MoveToEx((HDC) m_hDC, XLOG2DEV(x1), YLOG2DEV(y1), NULL);
-    (void)LineTo((HDC) m_hDC, XLOG2DEV(x2), YLOG2DEV(y2));
-    
-    /* MATTHEW: [6] New normalization */
-#if WX_STANDARD_GRAPHICS
-    (void)LineTo((HDC) m_hDC, XLOG2DEV(x2) + 1, YLOG2DEV(y2));
+#ifdef __WXMICROWIN__
+    if (!GetHDC()) return;

 #endif
     
 #endif
     

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

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

-void wxDC::DrawArc(long x1,long y1,long x2,long y2, long xc, long yc)
+// Draws an arc of a circle, centred on (xc, yc), with starting point (x1, y1)
+// and ending at (x2, y2)
+void wxDC::DoDrawArc(wxCoord x1, wxCoord y1,
+                     wxCoord x2, wxCoord y2,
+                     wxCoord xc, wxCoord yc)

 {
 {

-    double dx = xc-x1 ;
-    double dy = yc-y1 ;
-    double radius = (double)sqrt(dx*dx+dy*dy) ;;
-    if (x1==x2 && x2==y2)
+#ifdef __WXMICROWIN__
+    if (!GetHDC()) return;
+#endif
+    
+    wxColourChanger cc(*this); // needed for wxSTIPPLE_MASK_OPAQUE handling
+
+    double dx = xc - x1;
+    double dy = yc - y1;
+    double radius = (double)sqrt(dx*dx+dy*dy);
+    wxCoord r = (wxCoord)radius;
+
+    // treat the special case of full circle separately
+    if ( x1 == x2 && y1 == y2 )

     {
     {

-        DrawEllipse(xc,yc,(long)(radius*2.0),(long)(radius*2.0)) ;
-        return ;
+        DrawEllipse(xc - r, yc - r, 2*r, 2*r);
+        return;

     }
     }

-    
-    long xx1 = XLOG2DEV(x1) ;
-    long yy1 = YLOG2DEV(y1) ;
-    long xx2 = XLOG2DEV(x2) ;
-    long yy2 = YLOG2DEV(y2) ;
-    long xxc = XLOG2DEV(xc) ;
-    long yyc = YLOG2DEV(yc) ;
-    long ray = (long) sqrt(double((xxc-xx1)*(xxc-xx1)+(yyc-yy1)*(yyc-yy1))) ;
-    
-    (void)MoveToEx((HDC) m_hDC, (int) xx1, (int) yy1, NULL);
-    long xxx1 = (long) (xxc-ray);
-    long yyy1 = (long) (yyc-ray);
-    long xxx2 = (long) (xxc+ray);
-    long yyy2 = (long) (yyc+ray);
-    if (m_brush.Ok() && m_brush.GetStyle() !=wxTRANSPARENT)
+
+    wxCoord xx1 = XLOG2DEV(x1);
+    wxCoord yy1 = YLOG2DEV(y1);
+    wxCoord xx2 = XLOG2DEV(x2);
+    wxCoord yy2 = YLOG2DEV(y2);
+    wxCoord xxc = XLOG2DEV(xc);
+    wxCoord yyc = YLOG2DEV(yc);
+    wxCoord ray = (wxCoord) sqrt(double((xxc-xx1)*(xxc-xx1)+(yyc-yy1)*(yyc-yy1)));
+
+    wxCoord xxx1 = (wxCoord) (xxc-ray);
+    wxCoord yyy1 = (wxCoord) (yyc-ray);
+    wxCoord xxx2 = (wxCoord) (xxc+ray);
+    wxCoord yyy2 = (wxCoord) (yyc+ray);
+
+    if ( m_brush.Ok() && m_brush.GetStyle() != wxTRANSPARENT )

     {
         // Have to add 1 to bottom-right corner of rectangle
         // to make semi-circles look right (crooked line otherwise).
         // Unfortunately this is not a reliable method, depends
         // on the size of shape.
         // TODO: figure out why this happens!
     {
         // Have to add 1 to bottom-right corner of rectangle
         // to make semi-circles look right (crooked line otherwise).
         // Unfortunately this is not a reliable method, depends
         // on the size of shape.
         // TODO: figure out why this happens!

-        Pie((HDC) m_hDC,xxx1,yyy1,xxx2+1,yyy2+1,
-            xx1,yy1,xx2,yy2) ;
+        Pie(GetHdc(),xxx1,yyy1,xxx2+1,yyy2+1, xx1,yy1,xx2,yy2);

     }
     else
     }
     else

-        Arc((HDC) m_hDC,xxx1,yyy1,xxx2,yyy2,
-        xx1,yy1,xx2,yy2) ;
+    {
+        Arc(GetHdc(),xxx1,yyy1,xxx2,yyy2, xx1,yy1,xx2,yy2);
+    }
+
+    CalcBoundingBox(xc - r, yc - r);
+    CalcBoundingBox(xc + r, yc + r);
+}
+
+void wxDC::DoDrawCheckMark(wxCoord x1, wxCoord y1,
+                           wxCoord width, wxCoord height)
+{
+#ifdef __WXMICROWIN__
+    if (!GetHDC()) return;
+#endif

     
     

-    CalcBoundingBox((xc-radius), (yc-radius));
-    CalcBoundingBox((xc+radius), (yc+radius));
+    wxCoord x2 = x1 + width,
+            y2 = y1 + height;
+
+#if defined(__WIN32__) && !defined(__SC__) && !defined(__WXMICROWIN__)
+    RECT rect;
+    rect.left   = x1;
+    rect.top    = y1;
+    rect.right  = x2;
+    rect.bottom = y2;
+
+    DrawFrameControl(GetHdc(), &rect, DFC_MENU, DFCS_MENUCHECK);
+#else // Win16
+    // In WIN16, 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);
+    MoveToEx(GetHdc(), x1, y1, NULL);
+    LineTo(GetHdc(), x2, y2);
+    MoveToEx(GetHdc(), x2, y1, NULL);
+    LineTo(GetHdc(), x1, y2);
+    ::SelectObject(GetHdc(), hPenOld);
+    ::SelectObject(GetHdc(), hBrushOld);
+    ::DeleteObject(blackPen);
+#endif // Win32/16
+
+    CalcBoundingBox(x1, y1);
+    CalcBoundingBox(x2, y2);

 }
 
 }
 

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

 {
 {

+#ifdef __WXMICROWIN__
+    if (!GetHDC()) return;
+#endif
+    

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

-        color = m_pen.GetColour().GetPixel() ;
+        color = m_pen.GetColour().GetPixel();

     }
     }

-    
-    SetPixel((HDC) m_hDC, XLOG2DEV(x), YLOG2DEV(y), color);
-    
+
+    SetPixel(GetHdc(), XLOG2DEV(x), YLOG2DEV(y), color);
+

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

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

 {
 {

+#ifdef __WXMICROWIN__
+    if (!GetHDC()) return;
+#endif
+    
+    wxColourChanger cc(*this); // needed for wxSTIPPLE_MASK_OPAQUE handling
+

     // 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)
     {


@@ -438,12 +634,12 @@ void wxDC::DrawPolygon(int n, wxPoint points[], long xoffset, long yoffset,int f
         {
             cpoints[i].x = (int)(points[i].x + xoffset);
             cpoints[i].y = (int)(points[i].y + yoffset);
         {
             cpoints[i].x = (int)(points[i].x + xoffset);
             cpoints[i].y = (int)(points[i].y + yoffset);

-            
+

             CalcBoundingBox(cpoints[i].x, cpoints[i].y);
         }
             CalcBoundingBox(cpoints[i].x, cpoints[i].y);
         }

-        int prev = SetPolyFillMode((HDC) m_hDC,fillStyle==wxODDEVEN_RULE?ALTERNATE:WINDING) ;
-        (void)Polygon((HDC) m_hDC, cpoints, n);
-        SetPolyFillMode((HDC) m_hDC,prev) ;
+        int prev = SetPolyFillMode(GetHdc(),fillStyle==wxODDEVEN_RULE?ALTERNATE:WINDING);
+        (void)Polygon(GetHdc(), cpoints, n);
+        SetPolyFillMode(GetHdc(),prev);

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


@@ -451,15 +647,19 @@ void wxDC::DrawPolygon(int n, wxPoint points[], long xoffset, long yoffset,int f
         int i;
         for (i = 0; i < n; i++)
             CalcBoundingBox(points[i].x, points[i].y);
         int i;
         for (i = 0; i < n; i++)
             CalcBoundingBox(points[i].x, points[i].y);

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

     }
 }
 
     }
 }
 

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

 {
 {

+#ifdef __WXMICROWIN__
+    if (!GetHDC()) return;
+#endif
+    

     // 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)
     {


@@ -469,10 +669,10 @@ void wxDC::DrawLines(int n, wxPoint points[], long xoffset, long yoffset)
         {
             cpoints[i].x = (int)(points[i].x + xoffset);
             cpoints[i].y = (int)(points[i].y + yoffset);
         {
             cpoints[i].x = (int)(points[i].x + xoffset);
             cpoints[i].y = (int)(points[i].y + yoffset);

-            
+

             CalcBoundingBox(cpoints[i].x, cpoints[i].y);
         }
             CalcBoundingBox(cpoints[i].x, cpoints[i].y);
         }

-        (void)Polyline((HDC) m_hDC, cpoints, n);
+        (void)Polyline(GetHdc(), cpoints, n);

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


@@ -480,60 +680,63 @@ void wxDC::DrawLines(int n, wxPoint points[], long xoffset, long yoffset)
         int i;
         for (i = 0; i < n; i++)
             CalcBoundingBox(points[i].x, points[i].y);
         int i;
         for (i = 0; i < n; i++)
             CalcBoundingBox(points[i].x, points[i].y);

-        
-        (void)Polyline((HDC) m_hDC, (POINT*) points, n);
+
+        (void)Polyline(GetHdc(), (POINT*) points, n);

     }
 }
 
     }
 }
 

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

 {
 {

-    long x2 = x + width;
-    long y2 = y + height;
-    
-    /* MATTHEW: [6] new normalization */
-#if WX_STANDARD_GRAPHICS
-    bool do_brush, do_pen;
-    
-    do_brush = m_brush.Ok() && m_brush.GetStyle() != wxTRANSPARENT;
-    do_pen = m_pen.Ok() && m_pen.GetStyle() != wxTRANSPARENT;
-    
-    if (do_brush) {
-        HPEN orig_pen = NULL;
-        
-        if (do_pen || !m_pen.Ok())
-            orig_pen = (HPEN) ::SelectObject((HDC) m_hDC, (HPEN) ::GetStockObject(NULL_PEN));
-        
-        (void)Rectangle((HDC) m_hDC, XLOG2DEV(x), YLOG2DEV(y),
-            XLOG2DEV(x2) + 1, YLOG2DEV(y2) + 1);
-        
-        if (do_pen || !m_pen.Ok())
-            ::SelectObject((HDC) m_hDC , orig_pen);
-    }
-    if (do_pen) {
-        HBRUSH orig_brush = NULL;
-        
-        if (do_brush || !m_brush.Ok())
-            orig_brush = (HBRUSH) ::SelectObject((HDC) m_hDC, (HBRUSH) ::GetStockObject(NULL_BRUSH));
-        
-        (void)Rectangle((HDC) m_hDC, XLOG2DEV(x), YLOG2DEV(y),
-            XLOG2DEV(x2), YLOG2DEV(y2));
-        
-        if (do_brush || !m_brush.Ok())
-            ::SelectObject((HDC) m_hDC, orig_brush);
-    }
-#else
-    (void)Rectangle((HDC) m_hDC, XLOG2DEV(x), YLOG2DEV(y), XLOG2DEV(x2), YLOG2DEV(y2));
+#ifdef __WXMICROWIN__
+    if (!GetHDC()) return;

 #endif
     
 #endif
     

+    wxColourChanger cc(*this); // needed for wxSTIPPLE_MASK_OPAQUE handling
+
+    wxCoord x2 = x + width;
+    wxCoord y2 = y + height;
+
+    if ((m_logicalFunction == wxCOPY) && (m_pen.GetStyle() == wxTRANSPARENT))
+    {
+        RECT rect;
+        rect.left = XLOG2DEV(x);
+        rect.top = YLOG2DEV(y);
+        rect.right = XLOG2DEV(x2);
+        rect.bottom = YLOG2DEV(y2);
+        (void)FillRect(GetHdc(), &rect, (HBRUSH)m_brush.GetResourceHandle() );
+    }
+    else
+    {
+        // Windows draws the filled rectangles without outline (i.e. drawn with a
+        // transparent pen) one pixel smaller in both directions and we want them
+        // to have the same size regardless of which pen is used - adjust
+
+        // I wonder if this shouldn´t be done after the LOG2DEV() conversions. RR.
+        if ( m_pen.GetStyle() == wxTRANSPARENT )
+        {
+            x2++;
+            y2++;
+        }
+
+        (void)Rectangle(GetHdc(), XLOG2DEV(x), YLOG2DEV(y), XLOG2DEV(x2), YLOG2DEV(y2));
+    }
+
+

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

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

 {
 {

+#ifdef __WXMICROWIN__
+    if (!GetHDC()) return;
+#endif
+    
+    wxColourChanger cc(*this); // needed for wxSTIPPLE_MASK_OPAQUE handling
+

     // Now, a negative radius value is interpreted to mean
     // 'the proportion of the smallest X or Y dimension'
     // Now, a negative radius value is interpreted to mean
     // 'the proportion of the smallest X or Y dimension'

-    
+

     if (radius < 0.0)
     {
         double smallest = 0.0;
     if (radius < 0.0)
     {
         double smallest = 0.0;


@@ -543,142 +746,392 @@ void wxDC::DrawRoundedRectangle(long x, long y, long width, long height, double
             smallest = height;
         radius = (- radius * smallest);
     }
             smallest = height;
         radius = (- radius * smallest);
     }

-    
-    long x2 = (x+width);
-    long y2 = (y+height);
-    
-    (void)RoundRect((HDC) m_hDC, XLOG2DEV(x), YLOG2DEV(y), XLOG2DEV(x2),
-        YLOG2DEV(y2), 2*XLOG2DEV(radius), 2*YLOG2DEV(radius));
-    
+
+    wxCoord x2 = (x+width);
+    wxCoord y2 = (y+height);
+
+    // Windows draws the filled rectangles without outline (i.e. drawn with a
+    // transparent pen) one pixel smaller in both directions and we want them
+    // to have the same size regardless of which pen is used - adjust
+    if ( m_pen.GetStyle() == wxTRANSPARENT )
+    {
+        x2++;
+        y2++;
+    }
+
+    (void)RoundRect(GetHdc(), XLOG2DEV(x), YLOG2DEV(y), XLOG2DEV(x2),
+        YLOG2DEV(y2), (int) (2*XLOG2DEV(radius)), (int)( 2*YLOG2DEV(radius)));
+

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

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

 {
 {

-    long x2 = (x+width);
-    long y2 = (y+height);
-    
-    (void)Ellipse((HDC) m_hDC, XLOG2DEV(x), YLOG2DEV(y), XLOG2DEV(x2), YLOG2DEV(y2));
+#ifdef __WXMICROWIN__
+    if (!GetHDC()) return;
+#endif

     
     

+    wxColourChanger cc(*this); // needed for wxSTIPPLE_MASK_OPAQUE handling
+
+    wxCoord x2 = (x+width);
+    wxCoord y2 = (y+height);
+
+    (void)Ellipse(GetHdc(), XLOG2DEV(x), YLOG2DEV(y), XLOG2DEV(x2), YLOG2DEV(y2));
+

     CalcBoundingBox(x, y);
     CalcBoundingBox(x2, y2);
 }
 
 // Chris Breeze 20/5/98: first implementation of DrawEllipticArc on Windows
     CalcBoundingBox(x, y);
     CalcBoundingBox(x2, y2);
 }
 
 // Chris Breeze 20/5/98: first implementation of DrawEllipticArc on Windows

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

 {
 {

-    long x2 = (x+w);
-    long y2 = (y+h);
+#ifdef __WXMICROWIN__
+    if (!GetHDC()) return;
+#endif

     
     

-    const double deg2rad = 3.14159265359 / 180.0;
+    wxColourChanger cc(*this); // needed for wxSTIPPLE_MASK_OPAQUE handling
+
+    wxCoord x2 = x + w;
+    wxCoord y2 = y + h;
+

     int rx1 = XLOG2DEV(x+w/2);
     int ry1 = YLOG2DEV(y+h/2);
     int rx2 = rx1;
     int ry2 = ry1;
     int rx1 = XLOG2DEV(x+w/2);
     int ry1 = YLOG2DEV(y+h/2);
     int rx2 = rx1;
     int ry2 = ry1;

-    rx1 += (int)(100.0 * abs(w) * cos(sa * deg2rad));
-    ry1 -= (int)(100.0 * abs(h) * m_signY * sin(sa * deg2rad));
-    rx2 += (int)(100.0 * abs(w) * cos(ea * deg2rad));
-    ry2 -= (int)(100.0 * abs(h) * m_signY * sin(ea * deg2rad));
-    
+
+    sa = DegToRad(sa);
+    ea = DegToRad(ea);
+
+    rx1 += (int)(100.0 * abs(w) * cos(sa));
+    ry1 -= (int)(100.0 * abs(h) * m_signY * sin(sa));
+    rx2 += (int)(100.0 * abs(w) * cos(ea));
+    ry2 -= (int)(100.0 * abs(h) * m_signY * sin(ea));
+

     // draw pie with NULL_PEN first and then outline otherwise a line is
     // drawn from the start and end points to the centre
     // draw pie with NULL_PEN first and then outline otherwise a line is
     // drawn from the start and end points to the centre

-    HPEN orig_pen = (HPEN) ::SelectObject((HDC) m_hDC, (HPEN) ::GetStockObject(NULL_PEN));
+    HPEN hpenOld = (HPEN) ::SelectObject(GetHdc(), (HPEN) ::GetStockObject(NULL_PEN));

     if (m_signY > 0)
     {
     if (m_signY > 0)
     {

-        (void)Pie((HDC) m_hDC, XLOG2DEV(x), YLOG2DEV(y), XLOG2DEV(x2)+1, YLOG2DEV(y2)+1,
-            rx1, ry1, rx2, ry2);
+        (void)Pie(GetHdc(), XLOG2DEV(x), YLOG2DEV(y), XLOG2DEV(x2)+1, YLOG2DEV(y2)+1,
+                  rx1, ry1, rx2, ry2);

     }
     else
     {
     }
     else
     {

-        (void)Pie((HDC) m_hDC, XLOG2DEV(x), YLOG2DEV(y)-1, XLOG2DEV(x2)+1, YLOG2DEV(y2),
-            rx1, ry1-1, rx2, ry2-1);
+        (void)Pie(GetHdc(), XLOG2DEV(x), YLOG2DEV(y)-1, XLOG2DEV(x2)+1, YLOG2DEV(y2),
+                  rx1, ry1-1, rx2, ry2-1);

     }
     }

-    ::SelectObject((HDC) m_hDC, orig_pen);
-    (void)Arc((HDC) m_hDC, XLOG2DEV(x), YLOG2DEV(y), XLOG2DEV(x2), YLOG2DEV(y2),
-        rx1, ry1, rx2, ry2);
-    
+
+    ::SelectObject(GetHdc(), hpenOld);
+
+    (void)Arc(GetHdc(), XLOG2DEV(x), YLOG2DEV(y), XLOG2DEV(x2), YLOG2DEV(y2),
+              rx1, ry1, rx2, ry2);
+

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

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

 {
 {

-#if defined(__WIN32__) && !defined(__SC__) && !defined(__TWIN32__)
-    ::DrawIconEx((HDC) m_hDC, XLOG2DEV(x), YLOG2DEV(y), (HICON) icon.GetHICON(),
-        icon.GetWidth(), icon.GetHeight(), 0, 0, DI_NORMAL);
-#else
-    ::DrawIcon((HDC) m_hDC, XLOG2DEV(x), YLOG2DEV(y), (HICON) icon.GetHICON());
+#ifdef __WXMICROWIN__
+    if (!GetHDC()) return;

 #endif
     
 #endif
     

+    wxCHECK_RET( icon.Ok(), wxT("invalid icon in DrawIcon") );
+
+#ifdef __WIN32__
+    ::DrawIconEx(GetHdc(), XLOG2DEV(x), YLOG2DEV(y), GetHiconOf(icon), icon.GetWidth(), icon.GetHeight(), 0, NULL, DI_NORMAL);
+#else
+    ::DrawIcon(GetHdc(), XLOG2DEV(x), YLOG2DEV(y), GetHiconOf(icon));
+#endif
+

     CalcBoundingBox(x, y);
     CalcBoundingBox(x, y);

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

 }
 
 }
 

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

 {
 {

-    if (!bmp.Ok())
-        return;
+#ifdef __WXMICROWIN__
+    if (!GetHDC()) return;
+#endif

     
     

-    // If we're not drawing transparently, and not drawing to a printer,
-    // optimize this function to use Windows functions.
-    if (!useMask && !IsKindOf(CLASSINFO(wxPrinterDC)))
+    wxCHECK_RET( bmp.Ok(), _T("invalid bitmap in wxDC::DrawBitmap") );
+
+    int width = bmp.GetWidth(),
+        height = bmp.GetHeight();
+
+    HBITMAP hbmpMask = 0;
+
+    if ( useMask )
+    {
+        wxMask *mask = bmp.GetMask();
+        if ( mask )
+            hbmpMask = (HBITMAP)mask->GetMaskBitmap();
+
+        if ( !hbmpMask )
+        {
+            // don't give assert here because this would break existing
+            // programs - just silently ignore useMask parameter
+            useMask = FALSE;
+        }
+    }
+
+    if ( useMask )
+    {
+#ifdef __WIN32__
+        // use MaskBlt() with ROP which doesn't do anything to dst in the mask
+        // points
+        // On some systems, MaskBlt succeeds yet is much much slower
+        // than the wxWindows 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 hdcMem = ::CreateCompatibleDC(GetHdc());
+            ::SelectObject(hdcMem, GetHbitmapOf(bmp));
+
+            ok = ::MaskBlt(GetHdc(), x, y, width, height,
+                            hdcMem, 0, 0,
+                            hbmpMask, 0, 0,
+                            MAKEROP4(SRCCOPY, DSTCOPY)) != 0;
+            ::DeleteDC(hdcMem);
+        }
+
+        if ( !ok )
+#endif // Win32
+        {
+            // Rather than reproduce wxDC::Blit, let's do it at the wxWin API
+            // level
+            wxMemoryDC memDC;
+            memDC.SelectObject(bmp);
+
+            Blit(x, y, width, height, &memDC, 0, 0, wxCOPY, useMask);
+
+            memDC.SelectObject(wxNullBitmap);
+        }
+    }
+    else // no mask, just use BitBlt()

     {
     {

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

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

+
+        wxASSERT_MSG( hbitmap, wxT("bitmap is ok but HBITMAP is NULL?") );
+
+        COLORREF old_textground = ::GetTextColor(GetHdc());
+        COLORREF old_background = ::GetBkColor(GetHdc());
+        if (m_textForegroundColour.Ok())
+        {
+            ::SetTextColor(GetHdc(), m_textForegroundColour.GetPixel() );
+        }
+        if (m_textBackgroundColour.Ok())
+        {
+            ::SetBkColor(GetHdc(), m_textBackgroundColour.GetPixel() );
+        }
+

         ::SelectObject( memdc, hbitmap );
         ::SelectObject( memdc, hbitmap );

-        ::BitBlt( cdc, x, y, bmp.GetWidth(), bmp.GetHeight(), memdc, 0, 0, SRCCOPY);
-        ::SelectObject( memdc, 0 );
+        ::BitBlt( cdc, x, y, width, height, memdc, 0, 0, SRCCOPY);

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

+
+        ::SetTextColor(GetHdc(), old_textground);
+        ::SetBkColor(GetHdc(), old_background);
+    }
+}
+
+void wxDC::DoDrawText(const wxString& text, wxCoord x, wxCoord y)
+{
+#ifdef __WXMICROWIN__
+    if (!GetHDC()) return;
+#endif
+    
+    DrawAnyText(text, x, y);
+
+    // update the bounding box
+    CalcBoundingBox(x, y);
+
+    wxCoord w, h;
+    GetTextExtent(text, &w, &h);
+    CalcBoundingBox(x + w, y + h);
+}
+
+void wxDC::DrawAnyText(const wxString& text, wxCoord x, wxCoord y)
+{
+#ifdef __WXMICROWIN__
+    if (!GetHDC()) return;
+#endif
+    
+    // prepare for drawing the text
+    if ( m_textForegroundColour.Ok() )
+        SetTextColor(GetHdc(), m_textForegroundColour.GetPixel());
+
+    DWORD old_background = 0;
+    if ( m_textBackgroundColour.Ok() )
+    {
+        old_background = SetBkColor(GetHdc(), m_textBackgroundColour.GetPixel() );
+    }
+
+    SetBkMode(GetHdc(), m_backgroundMode == wxTRANSPARENT ? TRANSPARENT
+                                                          : OPAQUE);
+
+    if ( ::TextOut(GetHdc(), XLOG2DEV(x), YLOG2DEV(y),
+                   text.c_str(), text.length()) == 0 )
+    {
+        wxLogLastError(wxT("TextOut"));
+    }
+
+    // restore the old parameters (text foreground colour may be left because
+    // it never is set to anything else, but background should remain
+    // transparent even if we just drew an opaque string)
+    if ( m_textBackgroundColour.Ok() )
+        (void)SetBkColor(GetHdc(), old_background);
+
+    SetBkMode(GetHdc(), TRANSPARENT);
+}
+
+void wxDC::DoDrawRotatedText(const wxString& text,
+                             wxCoord x, wxCoord y,
+                             double angle)
+{
+#ifdef __WXMICROWIN__
+    if (!GetHDC()) return;
+#endif
+    
+    // we test that we have some font because otherwise we should still use the
+    // "else" part below to avoid that DrawRotatedText(angle = 180) and
+    // DrawRotatedText(angle = 0) use different fonts (we can't use the default
+    // font for drawing rotated fonts unfortunately)
+    if ( (angle == 0.0) && m_font.Ok() )
+    {
+        DoDrawText(text, x, y);

     }
     }

+#ifndef __WXMICROWIN__

     else
     {
     else
     {

-        // Rather than reproduce wxDC::Blit, let's do it at the wxWin API level
-        wxMemoryDC memDC;
-        memDC.SelectObject(bmp);
-        
-        /* Not sure if we need this. The mask should leave the
-        * masked areas as per the original background of this DC.
-        */
-        /*
-        // There might be transparent areas, so make these
-        // the same colour as this DC
-        memDC.SetBackground(* GetBackground());
-        memDC.Clear();
-        */
-        
-        Blit(x, y, bmp.GetWidth(), bmp.GetHeight(), & memDC, 0, 0, wxCOPY, useMask);
-        
-        memDC.SelectObject(wxNullBitmap);
+        // 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;
+        HFONT hfont = (HFONT)font.GetResourceHandle();
+        LOGFONT lf;
+        if ( ::GetObject(hfont, sizeof(lf), &lf) == 0 )
+        {
+            wxLogLastError(wxT("GetObject(hfont)"));
+        }
+
+        // GDI wants the angle in tenth of degree
+        long angle10 = (long)(angle * 10);
+        lf.lfEscapement = angle10;
+        lf. lfOrientation = angle10;
+
+        hfont = ::CreateFontIndirect(&lf);
+        if ( !hfont )
+        {
+            wxLogLastError(wxT("CreateFont"));
+        }
+        else
+        {
+            HFONT hfontOld = (HFONT)::SelectObject(GetHdc(), hfont);
+
+            DrawAnyText(text, x, y);
+
+            (void)::SelectObject(GetHdc(), hfontOld);
+            (void)::DeleteObject(hfont);
+        }
+
+        // call the bounding box by adding all four vertices of the rectangle
+        // containing the text to it (simpler and probably not slower than
+        // determining which of them is really topmost/leftmost/...)
+        wxCoord w, h;
+        GetTextExtent(text, &w, &h);
+
+        double rad = DegToRad(angle);
+
+        // "upper left" and "upper right"
+        CalcBoundingBox(x, y);
+        CalcBoundingBox(x + w*cos(rad), y - h*sin(rad));
+
+        // "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));
+    }
+#endif
+}
+
+// ---------------------------------------------------------------------------
+// set GDI objects
+// ---------------------------------------------------------------------------
+
+void wxDC::SetPalette(const wxPalette& palette)
+{
+#ifdef __WXMICROWIN__
+    if (!GetHDC()) return;
+#endif
+    
+    // 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);
+        m_oldPalette = 0;
+    }
+
+    m_palette = palette;
+
+    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;
+        }
+
+        return;
+    }
+
+    if (m_palette.Ok() && m_palette.GetHPALETTE())
+    {
+        HPALETTE oldPal = ::SelectPalette(GetHdc(), (HPALETTE) m_palette.GetHPALETTE(), TRUE);
+        if (!m_oldPalette)
+            m_oldPalette = (WXHPALETTE) oldPal;
+
+        ::RealizePalette(GetHdc());

     }
 }
 
 void wxDC::SetFont(const wxFont& the_font)
 {
     }
 }
 
 void wxDC::SetFont(const wxFont& the_font)
 {

+#ifdef __WXMICROWIN__
+    if (!GetHDC()) return;
+#endif
+    

     // Set the old object temporarily, in case the assignment deletes an object
     // that's not yet selected out.
     if (m_oldFont)
     {
     // Set the old object temporarily, in case the assignment deletes an object
     // that's not yet selected out.
     if (m_oldFont)
     {

-        ::SelectObject((HDC) m_hDC, (HFONT) m_oldFont);
+        ::SelectObject(GetHdc(), (HFONT) m_oldFont);

         m_oldFont = 0;
     }
         m_oldFont = 0;
     }

-    
+

     m_font = the_font;
     m_font = the_font;

-    
+

     if (!the_font.Ok())
     {
         if (m_oldFont)
     if (!the_font.Ok())
     {
         if (m_oldFont)

-            ::SelectObject((HDC) m_hDC, (HFONT) m_oldFont);
-        m_oldFont = 0 ;
+            ::SelectObject(GetHdc(), (HFONT) m_oldFont);
+        m_oldFont = 0;

     }
     }

-    
+

     if (m_font.Ok() && m_font.GetResourceHandle())
     {
     if (m_font.Ok() && m_font.GetResourceHandle())
     {

-        HFONT f = (HFONT) ::SelectObject((HDC) m_hDC, (HFONT) m_font.GetResourceHandle());
+        HFONT f = (HFONT) ::SelectObject(GetHdc(), (HFONT) m_font.GetResourceHandle());

         if (f == (HFONT) NULL)
         {
         if (f == (HFONT) NULL)
         {

-            wxDebugMsg("::SelectObject failed in wxDC::SetFont.");
+            wxLogDebug(wxT("::SelectObject failed in wxDC::SetFont."));

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


@@ -687,28 +1140,32 @@ void wxDC::SetFont(const wxFont& the_font)
 
 void wxDC::SetPen(const wxPen& pen)
 {
 
 void wxDC::SetPen(const wxPen& pen)
 {

+#ifdef __WXMICROWIN__
+    if (!GetHDC()) return;
+#endif
+    

     // Set the old object temporarily, in case the assignment deletes an object
     // that's not yet selected out.
     if (m_oldPen)
     {
     // Set the old object temporarily, in case the assignment deletes an object
     // that's not yet selected out.
     if (m_oldPen)
     {

-        ::SelectObject((HDC) m_hDC, (HPEN) m_oldPen);
+        ::SelectObject(GetHdc(), (HPEN) m_oldPen);

         m_oldPen = 0;
     }
         m_oldPen = 0;
     }

-    
+

     m_pen = pen;
     m_pen = pen;

-    
+

     if (!m_pen.Ok())
     {
         if (m_oldPen)
     if (!m_pen.Ok())
     {
         if (m_oldPen)

-            ::SelectObject((HDC) m_hDC, (HPEN) m_oldPen);
-        m_oldPen = 0 ;
+            ::SelectObject(GetHdc(), (HPEN) m_oldPen);
+        m_oldPen = 0;

     }
     }

-    
+

     if (m_pen.Ok())
     {
         if (m_pen.GetResourceHandle())
         {
     if (m_pen.Ok())
     {
         if (m_pen.GetResourceHandle())
         {

-            HPEN p = (HPEN) ::SelectObject((HDC) m_hDC, (HPEN)m_pen.GetResourceHandle()) ;
+            HPEN p = (HPEN) ::SelectObject(GetHdc(), (HPEN)m_pen.GetResourceHandle());

             if (!m_oldPen)
                 m_oldPen = (WXHPEN) p;
         }
             if (!m_oldPen)
                 m_oldPen = (WXHPEN) p;
         }


@@ -717,80 +1174,66 @@ void wxDC::SetPen(const wxPen& pen)
 
 void wxDC::SetBrush(const wxBrush& brush)
 {
 
 void wxDC::SetBrush(const wxBrush& brush)
 {

+#ifdef __WXMICROWIN__
+    if (!GetHDC()) return;
+#endif
+    

     // Set the old object temporarily, in case the assignment deletes an object
     // that's not yet selected out.
     if (m_oldBrush)
     {
     // Set the old object temporarily, in case the assignment deletes an object
     // that's not yet selected out.
     if (m_oldBrush)
     {

-        ::SelectObject((HDC) m_hDC, (HBRUSH) m_oldBrush);
+        ::SelectObject(GetHdc(), (HBRUSH) m_oldBrush);

         m_oldBrush = 0;
     }
         m_oldBrush = 0;
     }

-    
+

     m_brush = brush;
     m_brush = brush;

-    
+

     if (!m_brush.Ok())
     {
         if (m_oldBrush)
     if (!m_brush.Ok())
     {
         if (m_oldBrush)

-            ::SelectObject((HDC) m_hDC, (HBRUSH) m_oldBrush);
-        m_oldBrush = 0 ;
+            ::SelectObject(GetHdc(), (HBRUSH) m_oldBrush);
+        m_oldBrush = 0;

     }
     }

-    
+

     if (m_brush.Ok())
     {
     if (m_brush.Ok())
     {

-        if (m_brush.GetResourceHandle())
+        // to make sure the brush is alligned with the logical coordinates
+        wxBitmap *stipple = m_brush.GetStipple();
+        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 ( m_brush.GetResourceHandle() )

         {
             HBRUSH b = 0;
         {
             HBRUSH b = 0;

-            b = (HBRUSH) ::SelectObject((HDC) m_hDC, (HBRUSH)m_brush.GetResourceHandle()) ;
+            b = (HBRUSH) ::SelectObject(GetHdc(), (HBRUSH)m_brush.GetResourceHandle());

             if (!m_oldBrush)
                 m_oldBrush = (WXHBRUSH) b;
         }
     }
 }
 
             if (!m_oldBrush)
                 m_oldBrush = (WXHBRUSH) b;
         }
     }
 }
 

-void wxDC::DrawText(const wxString& text, long x, long y, bool use16bit)
+void wxDC::SetBackground(const wxBrush& brush)

 {
 {

-    // Should be unnecessary: SetFont should have done this already.
-#if 0
-    if (m_font.Ok() && m_font.GetResourceHandle())
-    {
-        HFONT f = (HFONT) ::SelectObject((HDC) m_hDC, (HFONT) m_font.GetResourceHandle());
-        if (!m_oldFont)
-            m_oldFont = (WXHFONT) f;
-    }
+#ifdef __WXMICROWIN__
+    if (!GetHDC()) return;

 #endif
     
 #endif
     

-    if (m_textForegroundColour.Ok())
-        SetTextColor((HDC) m_hDC, m_textForegroundColour.GetPixel() ) ;
-    
-    DWORD old_background = 0;
-    if (m_textBackgroundColour.Ok())
-    {
-        old_background = SetBkColor((HDC) m_hDC, m_textBackgroundColour.GetPixel() ) ;
-    }
-    
-    if (m_backgroundMode == wxTRANSPARENT)
-        SetBkMode((HDC) m_hDC, TRANSPARENT);
-    else
-        SetBkMode((HDC) m_hDC, OPAQUE);
-    
-    (void)TextOut((HDC) m_hDC, XLOG2DEV(x), YLOG2DEV(y), (char *) (const char *)text, strlen((const char *)text));
-    
-    if (m_textBackgroundColour.Ok())
-        (void)SetBkColor((HDC) m_hDC, old_background);
-    
-    CalcBoundingBox(x, y);
-    
-    long w, h;
-    GetTextExtent(text, &w, &h);
-    CalcBoundingBox((x + w), (y + h));
-}
-
-void wxDC::SetBackground(const wxBrush& brush)
-{

     m_backgroundBrush = brush;
     m_backgroundBrush = brush;

-    
+

     if (!m_backgroundBrush.Ok())
         return;
     if (!m_backgroundBrush.Ok())
         return;

-    
+

     if (m_canvas)
     {
         bool customColours = TRUE;
     if (m_canvas)
     {
         bool customColours = TRUE;


@@ -798,7 +1241,7 @@ void wxDC::SetBackground(const wxBrush& brush)
         // change background colours from the control-panel specified colours.
         if (m_canvas->IsKindOf(CLASSINFO(wxWindow)) && ((m_canvas->GetWindowStyleFlag() & wxUSER_COLOURS) != wxUSER_COLOURS))
             customColours = FALSE;
         // change background colours from the control-panel specified colours.
         if (m_canvas->IsKindOf(CLASSINFO(wxWindow)) && ((m_canvas->GetWindowStyleFlag() & wxUSER_COLOURS) != wxUSER_COLOURS))
             customColours = FALSE;

-        
+

         if (customColours)
         {
             if (m_backgroundBrush.GetStyle()==wxTRANSPARENT)
         if (customColours)
         {
             if (m_backgroundBrush.GetStyle()==wxTRANSPARENT)


@@ -819,136 +1262,195 @@ void wxDC::SetBackground(const wxBrush& brush)
             }
         }
     }
             }
         }
     }

-    COLORREF new_color = m_backgroundBrush.GetColour().GetPixel() ;
+    COLORREF new_color = m_backgroundBrush.GetColour().GetPixel();

     {
     {

-        (void)SetBkColor((HDC) m_hDC, new_color);
+        (void)SetBkColor(GetHdc(), new_color);

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

-    m_backgroundMode = mode;
+#ifdef __WXMICROWIN__
+    if (!GetHDC()) return;
+#endif

     
     

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

     if (m_backgroundMode == wxTRANSPARENT)
     if (m_backgroundMode == wxTRANSPARENT)

-        ::SetBkMode((HDC) m_hDC, TRANSPARENT);
+        ::SetBkMode(GetHdc(), TRANSPARENT);

     else
     else

-        ::SetBkMode((HDC) m_hDC, OPAQUE);
+        ::SetBkMode(GetHdc(), OPAQUE);
+       Last change:  AC   29 Jan 101    8:54 pm
+*/

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

-    m_logicalFunction = function;
+#ifdef __WXMICROWIN__
+    if (!GetHDC()) return;
+#endif

     
     

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

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

-    if (!dc || m_logicalFunction < 0)
+    if ( !dc || m_logicalFunction < 0 )

         return;
         return;

-    
-    int c_rop;
-    // These may be wrong
+
+    int rop;
+

     switch (m_logicalFunction)
     {
     switch (m_logicalFunction)
     {

-        //    case wxXOR: c_rop = R2_XORPEN; break;
-    case wxXOR: c_rop = R2_NOTXORPEN; break;
-    case wxINVERT: c_rop = R2_NOT; break;
-    case wxOR_REVERSE: c_rop = R2_MERGEPENNOT; break;
-    case wxAND_REVERSE: c_rop = R2_MASKPENNOT; break;
-    case wxCLEAR: c_rop = R2_WHITE; break;
-    case wxSET: c_rop = R2_BLACK; break;
-    case wxSRC_INVERT: c_rop = R2_NOTCOPYPEN; break;
-    case wxOR_INVERT: c_rop = R2_MERGENOTPEN; break;
-    case wxAND: c_rop = R2_MASKPEN; break;
-    case wxOR: c_rop = R2_MERGEPEN; break;
-    case wxAND_INVERT: c_rop = R2_MASKNOTPEN; break;
-    case wxEQUIV:
-    case wxNAND:
-    case wxCOPY:
-    default:
-        c_rop = R2_COPYPEN; break;
+        case wxCLEAR:        rop = R2_BLACK;         break;
+        case wxXOR:          rop = R2_XORPEN;        break;
+        case wxINVERT:       rop = R2_NOT;           break;
+        case wxOR_REVERSE:   rop = R2_MERGEPENNOT;   break;
+        case wxAND_REVERSE:  rop = R2_MASKPENNOT;    break;
+        case wxCOPY:         rop = R2_COPYPEN;       break;
+        case wxAND:          rop = R2_MASKPEN;       break;
+        case wxAND_INVERT:   rop = R2_MASKNOTPEN;    break;
+        case wxNO_OP:        rop = R2_NOP;           break;
+        case wxNOR:          rop = R2_NOTMERGEPEN;   break;
+        case wxEQUIV:        rop = R2_NOTXORPEN;     break;
+        case wxSRC_INVERT:   rop = R2_NOTCOPYPEN;    break;
+        case wxOR_INVERT:    rop = R2_MERGENOTPEN;   break;
+        case wxNAND:         rop = R2_NOTMASKPEN;    break;
+        case wxOR:           rop = R2_MERGEPEN;      break;
+        case wxSET:          rop = R2_WHITE;         break;
+
+        default:
+           wxFAIL_MSG( wxT("unsupported logical function") );
+           return;

     }
     }

-    SetROP2((HDC) dc, c_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)
+void wxDC::EndDoc()

 {
 }
 
 {
 }
 

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

 {
 }
 
 {
 }
 

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

 {
 }
 
 {
 }
 

-long wxDC::GetCharHeight(void) const
+// ---------------------------------------------------------------------------
+// text metrics
+// ---------------------------------------------------------------------------
+
+wxCoord wxDC::GetCharHeight() const

 {
 {

-    TEXTMETRIC lpTextMetric;
-    
-    GetTextMetrics((HDC) m_hDC, &lpTextMetric);
+#ifdef __WXMICROWIN__
+    if (!GetHDC()) return 0;
+#endif

     
     

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

     return YDEV2LOGREL(lpTextMetric.tmHeight);
 }
 
     return YDEV2LOGREL(lpTextMetric.tmHeight);
 }
 

-long wxDC::GetCharWidth(void) const
+wxCoord wxDC::GetCharWidth() const

 {
 {

-    TEXTMETRIC lpTextMetric;
-    
-    GetTextMetrics((HDC) m_hDC, &lpTextMetric);
+#ifdef __WXMICROWIN__
+    if (!GetHDC()) return 0;
+#endif

     
     

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

     return XDEV2LOGREL(lpTextMetric.tmAveCharWidth);
 }
 
     return XDEV2LOGREL(lpTextMetric.tmAveCharWidth);
 }
 

-void wxDC::GetTextExtent(const wxString& string, long *x, long *y,
-                         long *descent, long *externalLeading, wxFont *theFont, bool use16bit) const
+void wxDC::DoGetTextExtent(const wxString& string, wxCoord *x, wxCoord *y,
+                           wxCoord *descent, wxCoord *externalLeading,
+                           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

     
     

+    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((HDC) m_hDC, (char *)(const char *) string, strlen((char *)(const char *) string), &sizeRect);
-    GetTextMetrics((HDC) m_hDC, &tm);
-    
+
+    GetTextExtentPoint(GetHdc(), string, string.length(), &sizeRect);
+    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 = XDEV2LOGREL(sizeRect.cx);
     if (y) *y = YDEV2LOGREL(sizeRect.cy);
     if (descent) *descent = tm.tmDescent;
     if (externalLeading) *externalLeading = tm.tmExternalLeading;

+
+    if ( hfontOld )
+    {
+        ::SelectObject(GetHdc(), hfontOld);
+    }

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

-    m_mappingMode = mode;
+#ifdef __WXMICROWIN__
+    if (!GetHDC()) return;
+#endif

     
     

+    m_mappingMode = mode;
+

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

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

     if ((pixel_width == 0) || (pixel_height == 0) || (mm_width == 0) || (mm_height == 0))
     {
         return;
     }
     if ((pixel_width == 0) || (pixel_height == 0) || (mm_width == 0) || (mm_height == 0))
     {
         return;
     }

-    
+

     double mm2pixelsX = pixel_width/mm_width;
     double mm2pixelsY = pixel_height/mm_height;
     double mm2pixelsX = pixel_width/mm_width;
     double mm2pixelsY = pixel_height/mm_height;

-    
+

     switch (mode)
     {
     case wxMM_TWIPS:
     switch (mode)
     {
     case wxMM_TWIPS:


@@ -983,417 +1485,371 @@ void wxDC::SetMapMode(int mode)
             break;
         }
     }
             break;
         }
     }

-    
-    if (::GetMapMode((HDC) m_hDC) != MM_ANISOTROPIC)
-        ::SetMapMode((HDC) m_hDC, MM_ANISOTROPIC);
-    
-    SetViewportExtEx((HDC) m_hDC, VIEWPORT_EXTENT, VIEWPORT_EXTENT, NULL);
+
+    if (::GetMapMode(GetHdc()) != MM_ANISOTROPIC)
+        ::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);
     m_windowExtX = (int)MS_XDEV2LOGREL(VIEWPORT_EXTENT);
     m_windowExtY = (int)MS_YDEV2LOGREL(VIEWPORT_EXTENT);

-    ::SetWindowExtEx((HDC) m_hDC, m_windowExtX, m_windowExtY, NULL);
-    ::SetViewportOrgEx((HDC) m_hDC, (int)m_deviceOriginX, (int)m_deviceOriginY, NULL);
-    ::SetWindowOrgEx((HDC) m_hDC, (int)m_logicalOriginX, (int)m_logicalOriginY, NULL);
+    ::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);

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

+#ifdef __WXMICROWIN__
+    if (!GetHDC()) return;
+#endif
+    

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

-    
+

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

+#ifdef __WXMICROWIN__
+    if (!GetHDC()) return;
+#endif
+    

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

-    
+

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

-    m_systemScaleX = x;
-    m_systemScaleY = y;
+#ifdef __WXMICROWIN__
+    if (!GetHDC()) return;
+#endif

     
     

+    m_scaleX = x;
+    m_scaleY = y;
+

     SetMapMode(m_mappingMode);
 }
 
     SetMapMode(m_mappingMode);
 }
 

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

 {
 {

+#ifdef __WXMICROWIN__
+    if (!GetHDC()) return;
+#endif
+    

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

-    
-    ::SetWindowOrgEx((HDC) m_hDC, (int)m_logicalOriginX, (int)m_logicalOriginY, NULL);
+
+    ::SetWindowOrgEx(GetHdc(), (int)m_logicalOriginX, (int)m_logicalOriginY, NULL);

 }
 
 }
 

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

 {
 {

+#ifdef __WXMICROWIN__
+    if (!GetHDC()) return;
+#endif
+    

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

-    
-    ::SetViewportOrgEx((HDC) m_hDC, (int)m_deviceOriginX, (int)m_deviceOriginY, NULL);
-}

 
 

-long wxDC::DeviceToLogicalX(long x) const
-{
-    return (long) (((x) - m_deviceOriginX)/(m_logicalScaleX*m_userScaleX*m_signX*m_systemScaleX) - m_logicalOriginX) ;
+    ::SetViewportOrgEx(GetHdc(), (int)m_deviceOriginX, (int)m_deviceOriginY, NULL);

 }
 
 }
 

-long wxDC::DeviceToLogicalXRel(long x) const
-{
-    return (long) ((x)/(m_logicalScaleX*m_userScaleX*m_signX*m_systemScaleX)) ;
-}
+// ---------------------------------------------------------------------------
+// coordinates transformations
+// ---------------------------------------------------------------------------

 
 

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

 {
 {

-    return (long) (((y) - m_deviceOriginY)/(m_logicalScaleY*m_userScaleY*m_signY*m_systemScaleY) - m_logicalOriginY) ;
+    double xRel = x - m_deviceOriginX;
+    xRel /= m_logicalScaleX*m_userScaleX*m_signX*m_scaleX;
+    return (wxCoord)(xRel + m_logicalOriginX);

 }
 
 }
 

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

 {
 {

-    return (long) ((y)/(m_logicalScaleY*m_userScaleY*m_signY*m_systemScaleY)) ;
+    return (wxCoord) ((x)/(m_logicalScaleX*m_userScaleX*m_signX*m_scaleX));

 }
 
 }
 

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

 {
 {

-    return (long) (floor((x) - m_logicalOriginX)*m_logicalScaleX*m_userScaleX*m_signX*m_systemScaleX + m_deviceOriginX) ;
+    double yRel = y - m_deviceOriginY;
+    yRel /= m_logicalScaleY*m_userScaleY*m_signY*m_scaleY;
+    return (wxCoord)(yRel + m_logicalOriginY);

 }
 
 }
 

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

 {
 {

-    return (long) (floor(x)*m_logicalScaleX*m_userScaleX*m_signX*m_systemScaleX) ;
+    return (wxCoord) ((y)/(m_logicalScaleY*m_userScaleY*m_signY*m_scaleY));

 }
 
 }
 

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

 {
 {

-    return (long) (floor((y) - m_logicalOriginY)*m_logicalScaleY*m_userScaleY*m_signY*m_systemScaleY + m_deviceOriginY);
+    return (wxCoord) ((x - m_logicalOriginX)*m_logicalScaleX*m_userScaleX*m_signX*m_scaleX + m_deviceOriginX);

 }
 
 }
 

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

 {
 {

-    return (long) (floor(y)*m_logicalScaleY*m_userScaleY*m_signY*m_systemScaleY) ;
+    return (wxCoord) (x*m_logicalScaleX*m_userScaleX*m_signX*m_scaleX);

 }
 
 }
 

-// This group of functions may not do any conversion
-// if m_scaleGDI is TRUE, since the HDC does the
-// conversion automatically.
-
-long wxDC::ImplDeviceToLogicalX(long x) const
+wxCoord wxDCBase::LogicalToDeviceY(wxCoord y) const

 {
 {

-    //  return (m_scaleGDI ?  x :  DeviceToLogicalX(x));
-    return x;
+    return (wxCoord) ((y - m_logicalOriginY)*m_logicalScaleY*m_userScaleY*m_signY*m_scaleY + m_deviceOriginY);

 }
 
 }
 

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

 {
 {

-    //  return (m_scaleGDI ?  y :  DeviceToLogicalY(y));
-    return y;
+    return (wxCoord) (y*m_logicalScaleY*m_userScaleY*m_signY*m_scaleY);

 }
 
 }
 

-long wxDC::ImplDeviceToLogicalXRel(long x) const
-{
-    //  return (m_scaleGDI ?  x :  DeviceToLogicalXRel(x));
-    return x;
-}
+// ---------------------------------------------------------------------------
+// bit blit
+// ---------------------------------------------------------------------------

 
 

-long wxDC::ImplDeviceToLogicalYRel(long y) const
+bool wxDC::DoBlit(wxCoord xdest, wxCoord ydest,
+                  wxCoord width, wxCoord height,
+                  wxDC *source, wxCoord xsrc, wxCoord ysrc,
+                  int rop, bool useMask,
+                  wxCoord xsrcMask, wxCoord ysrcMask)

 {
 {

-    //  return (m_scaleGDI ?  y :  DeviceToLogicalYRel(y));
-    return y;
-}
-
-long wxDC::ImplLogicalToDeviceX(long x) const
-{
-    //  return (m_scaleGDI ?  (floor(double(x))) :  LogicalToDeviceX(x));
-    return x;
-}
-
-long wxDC::ImplLogicalToDeviceY(long y) const
-{
-    //  return (m_scaleGDI ?  (floor(double(y))) :  LogicalToDeviceY(y));
-    return y;
-}
+#ifdef __WXMICROWIN__
+    if (!GetHDC()) return FALSE;
+#endif
+    
+    wxMask *mask = NULL;
+    if ( useMask )
+    {
+        const wxBitmap& bmp = source->m_selectedBitmap;
+        mask = bmp.GetMask();

 
 

-long wxDC::ImplLogicalToDeviceXRel(long x) const
-{
-    //  return (m_scaleGDI ?  (floor(double(x))) :  LogicalToDeviceXRel(x));
-    return x;
-}
+        if ( !(bmp.Ok() && mask && mask->GetMaskBitmap()) )
+        {
+            // don't give assert here because this would break existing
+            // programs - just silently ignore useMask parameter
+            useMask = FALSE;
+        }
+    }

 
 

-long wxDC::ImplLogicalToDeviceYRel(long y) const
-{
-    //  return (m_scaleGDI ?  (floor(double(y))) :  LogicalToDeviceYRel(y));
-    return y;
-}
+    if (xsrcMask == -1 && ysrcMask == -1)
+    {
+        xsrcMask = xsrc; ysrcMask = ysrc;
+    }

 
 

-bool wxDC::Blit(long xdest, long ydest, long width, long height,
-                wxDC *source, long xsrc, long ysrc, int rop, bool useMask)
-{
-    long xdest1 = xdest;
-    long ydest1 = ydest;
-    long xsrc1 = xsrc;
-    long ysrc1 = ysrc;
-    
-    // Chris Breeze 18/5/98: use text foreground/background colours
-    // when blitting from 1-bit bitmaps
-    COLORREF old_textground = ::GetTextColor((HDC)m_hDC);
-    COLORREF old_background = ::GetBkColor((HDC)m_hDC);
+    COLORREF old_textground = ::GetTextColor(GetHdc());
+    COLORREF old_background = ::GetBkColor(GetHdc());

     if (m_textForegroundColour.Ok())
     {
     if (m_textForegroundColour.Ok())
     {

-        ::SetTextColor((HDC) m_hDC, m_textForegroundColour.GetPixel() ) ;
+        ::SetTextColor(GetHdc(), m_textForegroundColour.GetPixel() );

     }
     if (m_textBackgroundColour.Ok())
     {
     }
     if (m_textBackgroundColour.Ok())
     {

-        ::SetBkColor((HDC) m_hDC, m_textBackgroundColour.GetPixel() ) ;
+        ::SetBkColor(GetHdc(), m_textBackgroundColour.GetPixel() );

     }
     }

-    
-    DWORD dwRop = rop == wxCOPY ? SRCCOPY :
-    rop == wxCLEAR ? WHITENESS :
-    rop == wxSET ? BLACKNESS :
-    rop == wxINVERT ? DSTINVERT :
-    rop == wxAND ? MERGECOPY :
-    rop == wxOR ? MERGEPAINT :
-    rop == wxSRC_INVERT ? NOTSRCCOPY :
-    rop == wxXOR ? SRCINVERT :
-    rop == wxOR_REVERSE ? MERGEPAINT :
-    rop == wxAND_REVERSE ? SRCERASE :
-    rop == wxSRC_OR ? SRCPAINT :
-    rop == wxSRC_AND ? SRCAND :
-    SRCCOPY;
-    
-    bool success = TRUE;
-    if (useMask && source->m_selectedBitmap.Ok() && source->m_selectedBitmap.GetMask())
-    {
-        
-#if 0 // __WIN32__
-        // Not implemented under Win95 (or maybe a specific device?)
-        if (MaskBlt((HDC) m_hDC, xdest1, ydest1, (int)width, (int)height,
-            (HDC) source->m_hDC, xsrc1, ysrc1, (HBITMAP) source->m_selectedBitmap.GetMask()->GetMaskBitmap(),
-            0, 0, 0xAACC0020))
+
+    DWORD dwRop = SRCCOPY;
+    switch (rop)
+    {
+        case wxXOR:          dwRop = SRCINVERT;        break;
+        case wxINVERT:       dwRop = DSTINVERT;        break;
+        case wxOR_REVERSE:   dwRop = 0x00DD0228;       break;
+        case wxAND_REVERSE:  dwRop = SRCERASE;         break;
+        case wxCLEAR:        dwRop = BLACKNESS;        break;
+        case wxSET:          dwRop = WHITENESS;        break;
+        case wxOR_INVERT:    dwRop = MERGEPAINT;       break;
+        case wxAND:          dwRop = SRCAND;           break;
+        case wxOR:           dwRop = SRCPAINT;         break;
+        case wxEQUIV:        dwRop = 0x00990066;       break;
+        case wxNAND:         dwRop = 0x007700E6;       break;
+        case wxAND_INVERT:   dwRop = 0x00220326;       break;
+        case wxCOPY:         dwRop = SRCCOPY;          break;
+        case wxNO_OP:        dwRop = DSTCOPY;          break;
+        case wxSRC_INVERT:   dwRop = NOTSRCCOPY;       break;
+        case wxNOR:          dwRop = NOTSRCCOPY;       break;
+        default:
+           wxFAIL_MSG( wxT("unsupported logical function") );
+           return FALSE;
+    }
+
+    bool success = FALSE;
+
+    if (useMask)
+    {
+#ifdef __WIN32__
+        // we want the part of the image corresponding to the mask to be
+        // transparent, so use "DSTCOPY" ROP for the mask points (the usual
+        // meaning of fg and bg is inverted which corresponds to wxWin notion
+        // of the mask which is also contrary to the Windows one)
+
+        // On some systems, MaskBlt succeeds yet is much much slower
+        // than the wxWindows 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
+           success = ::MaskBlt(GetHdc(), xdest, ydest, width, height,
+                            GetHdcOf(*source), xsrc, ysrc,
+                            (HBITMAP)mask->GetMaskBitmap(), xsrcMask, ysrcMask,
+                            MAKEROP4(dwRop, DSTCOPY)) != 0;

         }
         }

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

         {
         {

-            // Old code
-#if 0
-            HDC dc_mask = CreateCompatibleDC((HDC) source->m_hDC);
-            ::SelectObject(dc_mask, (HBITMAP) source->m_selectedBitmap.GetMask()->GetMaskBitmap());
-            success = (BitBlt((HDC) m_hDC, xdest1, ydest1, (int)width, (int)height,
-                dc_mask, xsrc1, ysrc1, 0x00220326 /* NOTSRCAND */) != 0);
-            success = (BitBlt((HDC) m_hDC, xdest1, ydest1, (int)width, (int)height,
-                (HDC) source->m_hDC, xsrc1, ysrc1, SRCPAINT) != 0);
-            ::SelectObject(dc_mask, 0);
-            ::DeleteDC(dc_mask);
-#endif
-            // New code from Chris Breeze, 15/7/98

             // Blit bitmap with mask
             // Blit bitmap with mask

-            
-            if (IsKindOf(CLASSINFO(wxPrinterDC)))
+            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
+            dc_mask = ::CreateCompatibleDC(GetHdcOf(*source));
+            dc_buffer = ::CreateCompatibleDC(GetHdc());
+            buffer_bmap = ::CreateCompatibleBitmap(GetHdc(), width, height);
+            ::SelectObject(dc_mask, (HBITMAP) mask->GetMaskBitmap());
+            ::SelectObject(dc_buffer, buffer_bmap);
+#endif // wxUSE_DC_CACHEING/!wxUSE_DC_CACHEING
+
+            // copy dest to buffer
+            if ( !::BitBlt(dc_buffer, 0, 0, (int)width, (int)height,
+                           GetHdc(), xdest, ydest, SRCCOPY) )

             {
             {

-                // If we are printing source colours are screen colours
-                // not printer colours and so we need copy the bitmap
-                // pixel by pixel.
-                RECT rect;
-                HDC dc_mask = ::CreateCompatibleDC((HDC) source->m_hDC);
-                HDC dc_src = (HDC) source->m_hDC;
-                
-                ::SelectObject(dc_mask, (HBITMAP) source->m_selectedBitmap.GetMask()->GetMaskBitmap());
-                for (int x = 0; x < width; x++)
-                {
-                    for (int y = 0; y < height; y++)
-                    {
-                        COLORREF cref = ::GetPixel(dc_mask, x, y);
-                        if (cref)
-                        {
-                            HBRUSH brush = ::CreateSolidBrush(::GetPixel(dc_src, x, y));
-                            rect.left = xdest1 + x; rect.right = rect.left + 1;
-                            rect.top = ydest1 + y;  rect.bottom = rect.top + 1;
-                            ::FillRect((HDC) m_hDC, &rect, brush);
-                            ::DeleteObject(brush);
-                        }
-                    }
-                }
-                ::SelectObject(dc_mask, 0);
-                ::DeleteDC(dc_mask);
+                wxLogLastError(wxT("BitBlt"));

             }
             }

-            else
+
+            // copy src to buffer using selected raster op
+            if ( !::BitBlt(dc_buffer, 0, 0, (int)width, (int)height,
+                           GetHdcOf(*source), xsrc, ysrc, dwRop) )
+            {
+                wxLogLastError(wxT("BitBlt"));
+            }
+
+            // set masked area in buffer to BLACK (pixel value 0)
+            COLORREF prevBkCol = ::SetBkColor(GetHdc(), RGB(255, 255, 255));
+            COLORREF prevCol = ::SetTextColor(GetHdc(), RGB(0, 0, 0));
+            if ( !::BitBlt(dc_buffer, 0, 0, (int)width, (int)height,
+                           dc_mask, xsrcMask, ysrcMask, SRCAND) )
+            {
+                wxLogLastError(wxT("BitBlt"));
+            }
+
+            // set unmasked area in dest to BLACK
+            ::SetBkColor(GetHdc(), RGB(0, 0, 0));
+            ::SetTextColor(GetHdc(), RGB(255, 255, 255));
+            if ( !::BitBlt(GetHdc(), xdest, ydest, (int)width, (int)height,
+                           dc_mask, xsrcMask, ysrcMask, SRCAND) )
+            {
+                wxLogLastError(wxT("BitBlt"));
+            }
+            ::SetBkColor(GetHdc(), prevBkCol);   // restore colours to original values
+            ::SetTextColor(GetHdc(), prevCol);
+
+            // OR buffer to dest
+            success = ::BitBlt(GetHdc(), xdest, ydest,
+                               (int)width, (int)height,
+                               dc_buffer, 0, 0, SRCPAINT) != 0;
+            if ( !success )
+            {
+                wxLogLastError(wxT("BitBlt"));
+            }
+
+            // tidy up temporary DCs and bitmap
+            ::SelectObject(dc_mask, 0);
+            ::SelectObject(dc_buffer, 0);
+
+#if !wxUSE_DC_CACHEING

             {
             {

-                // create a temp buffer bitmap and DCs to access it and the mask
-                HDC dc_mask = ::CreateCompatibleDC((HDC) source->m_hDC);
-                HDC dc_buffer = ::CreateCompatibleDC((HDC) m_hDC);
-                HBITMAP buffer_bmap = ::CreateCompatibleBitmap((HDC) m_hDC, width, height);
-                ::SelectObject(dc_mask, (HBITMAP) source->m_selectedBitmap.GetMask()->GetMaskBitmap());
-                ::SelectObject(dc_buffer, buffer_bmap);
-                
-                // copy dest to buffer
-                ::BitBlt(dc_buffer, 0, 0, (int)width, (int)height,
-                    (HDC) m_hDC, xdest1, ydest1, SRCCOPY);
-                
-                // copy src to buffer using selected raster op
-                ::BitBlt(dc_buffer, 0, 0, (int)width, (int)height,
-                    (HDC) source->m_hDC, xsrc1, ysrc1, dwRop);
-                
-                // set masked area in buffer to BLACK (pixel value 0)
-                COLORREF prevBkCol = ::SetBkColor((HDC) m_hDC, RGB(255, 255, 255));
-                COLORREF prevCol = ::SetTextColor((HDC) m_hDC, RGB(0, 0, 0));
-                ::BitBlt(dc_buffer, 0, 0, (int)width, (int)height,
-                    dc_mask, xsrc1, ysrc1, SRCAND);
-                
-                // set unmasked area in dest to BLACK
-                ::SetBkColor((HDC) m_hDC, RGB(0, 0, 0));
-                ::SetTextColor((HDC) m_hDC, RGB(255, 255, 255));
-                ::BitBlt((HDC) m_hDC, xdest1, ydest1, (int)width, (int)height,
-                    dc_mask, xsrc1, ysrc1, SRCAND);
-                ::SetBkColor((HDC) m_hDC, prevBkCol);   // restore colours to original values
-                ::SetTextColor((HDC) m_hDC, prevCol);
-                
-                // OR buffer to dest
-                success = (::BitBlt((HDC) m_hDC, xdest1, ydest1, (int)width, (int)height,
-                    dc_buffer, 0, 0, SRCPAINT) != 0);
-                
-                // tidy up temporary DCs and bitmap
-                ::SelectObject(dc_mask, 0);

                 ::DeleteDC(dc_mask);
                 ::DeleteDC(dc_mask);

-                ::SelectObject(dc_buffer, 0);

                 ::DeleteDC(dc_buffer);
                 ::DeleteObject(buffer_bmap);
             }
                 ::DeleteDC(dc_buffer);
                 ::DeleteObject(buffer_bmap);
             }

+#endif

         }
     }
         }
     }

-    else
+    else // no mask, just BitBlt() it

     {
     {

-        if (IsKindOf(CLASSINFO(wxPrinterDC)))
+        success = ::BitBlt(GetHdc(), xdest, ydest,
+                           (int)width, (int)height,
+                           GetHdcOf(*source), xsrc, ysrc, dwRop) != 0;
+        if ( !success )

         {
         {

-            // If we are printing, source colours are screen colours
-            // not printer colours and so we need copy the bitmap
-            // pixel by pixel.
-            HDC dc_src = (HDC) source->m_hDC;
-            RECT rect;
-            for (int x = 0; x < width; x++)
-            {
-                for (int y = 0; y < height; y++)
-                {
-                    HBRUSH brush = ::CreateSolidBrush(::GetPixel(dc_src, x, y));
-                    rect.left = xdest1 + x;   rect.right = rect.left + 1;
-                    rect.top = ydest1 + y;    rect.bottom = rect.top + 1;
-                    ::FillRect((HDC) m_hDC, &rect, brush);
-                    ::DeleteObject(brush);
-                }
-            }
-        }
-        else
-        {
-            success = (BitBlt((HDC) m_hDC, xdest1, ydest1, (int)width, (int)height, (HDC) source->m_hDC,
-                xsrc1, ysrc1, dwRop) != 0);
+            wxLogLastError(wxT("BitBlt"));

         }
     }
         }
     }

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

 
 

-void wxDC::GetSizeMM(int *width, int *height) const
-{
-    int w=::GetDeviceCaps((HDC) m_hDC,HORZSIZE);
-    int h=::GetDeviceCaps((HDC) m_hDC,VERTSIZE);
-    *width = w;
-    *height = h;
-}
-
-// Resolution in Pixels per inch
-wxSize wxDC::GetPPI(void) const
-{
-    int x=::GetDeviceCaps((HDC) m_hDC,LOGPIXELSX);
-    int y=::GetDeviceCaps((HDC) m_hDC,LOGPIXELSY);
-    return wxSize(x, y);
+    return success;

 }
 
 }
 

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

 {
 {

-    int n = list->Number();
-    wxPoint *points = new wxPoint[n];
+#ifdef __WXMICROWIN__
+    if (!GetHDC()) return;
+#endif

     
     

-    int i = 0;
-    for(wxNode *node = list->First(); node; node = node->Next()) {
-        wxPoint *point = (wxPoint *)node->Data();
-        points[i].x = point->x;
-        points[i++].y = point->y;
-    }
-    DrawPolygon(n, points, xoffset, yoffset,fillStyle);
-    delete[] points;
+    if ( w ) *w = ::GetDeviceCaps(GetHdc(), HORZRES);
+    if ( h ) *h = ::GetDeviceCaps(GetHdc(), VERTRES);

 }
 
 }
 

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

 {
 {

-    int n = list->Number();
-    wxPoint *points = new wxPoint[n];
+#ifdef __WXMICROWIN__
+    if (!GetHDC()) return;
+#endif

     
     

-    int i = 0;
-    for(wxNode *node = list->First(); node; node = node->Next()) {
-        wxPoint *point = (wxPoint *)node->Data();
-        points[i].x = point->x;
-        points[i++].y = point->y;
-    }
-    DrawLines(n, points, xoffset, yoffset);
-    delete []points;
+    if ( w ) *w = ::GetDeviceCaps(GetHdc(), HORZSIZE);
+    if ( h ) *h = ::GetDeviceCaps(GetHdc(), VERTSIZE);

 }
 
 }
 

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

 {
 {

-    m_textForegroundColour = colour;
-}
+#ifdef __WXMICROWIN__
+    if (!GetHDC()) return wxSize();
+#endif
+    
+    int x = ::GetDeviceCaps(GetHdc(), LOGPIXELSX);
+    int y = ::GetDeviceCaps(GetHdc(), LOGPIXELSY);

 
 

-void wxDC::SetTextBackground(const wxColour& colour)
-{
-    m_textBackgroundColour = colour;
+    return wxSize(x, y);

 }
 
 // For use by wxWindows only, unless custom units are required.
 void wxDC::SetLogicalScale(double x, double y)
 {
 }
 
 // For use by wxWindows only, unless custom units are required.
 void wxDC::SetLogicalScale(double x, double y)
 {

+#ifdef __WXMICROWIN__
+    if (!GetHDC()) return;
+#endif
+    

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

-void wxDC::CalcBoundingBox(long x, long y)
-{
-    if (x < m_minX) m_minX = x;
-    if (y < m_minY) m_minY = y;
-    if (x > m_maxX) m_maxX = x;
-    if (y > m_maxY) m_maxY = y;
-}
-
-void wxDC::GetClippingBox(long *x,long *y,long *w,long *h) const
-{
-    if (m_clipping)
-    {
-        *x = m_clipX1 ;
-        *y = m_clipY1 ;
-        *w = (m_clipX2 - m_clipX1) ;
-        *h = (m_clipY2 - m_clipY1) ;
-    }
-    else
-        *x = *y = *w = *h = 0 ;
-}
-

 #if WXWIN_COMPATIBILITY
 #if WXWIN_COMPATIBILITY

-void wxDC::GetTextExtent(const wxString& string, float *x, float *y,
+void wxDC::DoGetTextExtent(const wxString& string, float *x, float *y,

                          float *descent, float *externalLeading,
                          wxFont *theFont, bool use16bit) const
 {
                          float *descent, float *externalLeading,
                          wxFont *theFont, bool use16bit) const
 {

-    long x1, y1, descent1, externalLeading1;
+#ifdef __WXMICROWIN__
+    if (!GetHDC()) return;
+#endif
+    
+    wxCoord x1, y1, descent1, externalLeading1;

     GetTextExtent(string, & x1, & y1, & descent1, & externalLeading1, theFont, use16bit);
     *x = x1; *y = y1;
     if (descent)
     GetTextExtent(string, & x1, & y1, & descent1, & externalLeading1, theFont, use16bit);
     *x = x1; *y = y1;
     if (descent)


@@ -1403,279 +1859,141 @@ void wxDC::GetTextExtent(const wxString& string, float *x, float *y,
 }
 #endif
 
 }
 #endif
 

-int wxDC::GetDepth(void) const
-{
-    return (int) ::GetDeviceCaps((HDC) m_hDC,BITSPIXEL);
-}
+#if wxUSE_DC_CACHEING

 
 

-#if wxUSE_SPLINES
-
-// Make a 3-point spline
-void wxDC::DrawSpline(long x1, long y1, long x2, long y2, long x3, long y3)
-{
-    wxList *point_list = new wxList;
-    
-    wxPoint *point1 = new wxPoint;
-    point1->x = x1; point1->y = y1;
-    point_list->Append((wxObject*)point1);
-    
-    wxPoint *point2 = new wxPoint;
-    point2->x = x2; point2->y = y2;
-    point_list->Append((wxObject*)point2);
-    
-    wxPoint *point3 = new wxPoint;
-    point3->x = x3; point3->y = y3;
-    point_list->Append((wxObject*)point3);
-    
-    DrawSpline(point_list);
-    
-    for(wxNode *node = point_list->First(); node; node = node->Next()) {
-        wxPoint *p = (wxPoint *)node->Data();
-        delete p;
-    }
-    delete point_list;
-}
+/*
+ * 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
+ */

 
 

-////#define     wx_round(a)    (int)((a)+.5)
-//#define     wx_round(a)    (a)
+wxList wxDC::sm_bitmapCache;
+wxList wxDC::sm_dcCache;

 
 

-class wxSpline: public wxObject
+wxDCCacheEntry::wxDCCacheEntry(WXHBITMAP hBitmap, int w, int h, int depth)

 {
 {

-public:
-    int type;
-    wxList *points;
-    
-    wxSpline(wxList *list);
-    void DeletePoints(void);
-    
-    // Doesn't delete points
-    ~wxSpline(void);
-};
-
-void wxDC::DrawSpline(int n, wxPoint points[])
-{
-    wxList list;
-    int i;
-    for (i =0; i < n; i++)
-        list.Append((wxObject*)&points[i]);
-    DrawSpline((wxList *)&list);
+    m_bitmap = hBitmap;
+    m_dc = 0;
+    m_width = w;
+    m_height = h;
+    m_depth = depth;

 }
 
 }
 

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

 {
 {

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

 }
 
 }
 

-
-wxList wx_spline_point_list;
-
-void wx_draw_open_spline(wxDC *dc, wxSpline *spline)
+wxDCCacheEntry::~wxDCCacheEntry()

 {
 {

-    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);
-    
-    wx_spline_add_point(x1, y1);
-    
-    while ((node = node->Next()) != NULL)
-    {
-        p = (wxPoint *)node->Data();
-        x1 = x2;
-        y1 = y2;
-        x2 = p->x;
-        y2 = p->y;
-        cx4 = (double)(x1 + x2) / 2;
-        cy4 = (double)(y1 + y2) / 2;
-        cx3 = (double)(x1 + cx4) / 2;
-        cy3 = (double)(y1 + cy4) / 2;
-        
-        wx_quadratic_spline(cx1, cy1, cx2, cy2, cx3, cy3, cx4, cy4);
-        
-        cx1 = cx4;
-        cy1 = cy4;
-        cx2 = (double)(cx1 + x2) / 2;
-        cy2 = (double)(cy1 + y2) / 2;
-    }
-    
-    wx_spline_add_point((double)wx_round(cx1), (double)wx_round(cy1));
-    wx_spline_add_point(x2, y2);
-    
-    wx_spline_draw_point_array(dc);
-    
+    if (m_bitmap)
+        ::DeleteObject((HBITMAP) m_bitmap);
+    if (m_dc)
+        ::DeleteDC((HDC) m_dc);

 }
 
 }
 

-/********************* CURVES FOR SPLINES *****************************
-
-  The following spline drawing routine is from
-  
-    "An Algorithm for High-Speed Curve Generation"
-    by George Merrill Chaikin,
-    Computer Graphics and Image Processing, 3, Academic Press,
-    1974, 346-349.
-    
-      and
-      
-        "On Chaikin's Algorithm" by R. F. Riesenfeld,
-        Computer Graphics and Image Processing, 4, Academic Press,
-        1975, 304-310.
-        
-***********************************************************************/
-
-#define     half(z1, z2)    ((z1+z2)/2.0)
-#define     THRESHOLD   5
-
-/* iterative version */
-
-void wx_quadratic_spline(double a1, double b1, double a2, double b2, double a3, double b3, double a4,
-                         double b4)
+wxDCCacheEntry* wxDC::FindBitmapInCache(WXHDC dc, int w, int h)

 {
 {

-    register double  xmid, ymid;
-    double           x1, y1, x2, y2, x3, y3, x4, y4;
-    
-    wx_clear_stack();
-    wx_spline_push(a1, b1, a2, b2, a3, b3, a4, b4);
-    
-    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);
-        }
-    }
-}
-
-
-/* utilities used by spline drawing routines */
+    int depth = ::GetDeviceCaps((HDC) dc, PLANES) * ::GetDeviceCaps((HDC) dc, BITSPIXEL);
+    wxNode* node = sm_bitmapCache.First();
+    while (node)
+    {
+        wxDCCacheEntry* entry = (wxDCCacheEntry*) node->Data();

 
 

+        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;
+        }

 
 

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

 }
 }

-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(void)
+wxDCCacheEntry* wxDC::FindDCInCache(wxDCCacheEntry* notThis, WXHDC dc)

 {
 {

-    wx_stack_top = wx_spline_stack;
-    wx_stack_count = 0;
-}
+    int depth = ::GetDeviceCaps((HDC) dc, PLANES) * ::GetDeviceCaps((HDC) dc, BITSPIXEL);
+    wxNode* node = sm_dcCache.First();
+    while (node)
+    {
+        wxDCCacheEntry* entry = (wxDCCacheEntry*) node->Data();

 
 

-void wx_spline_push(double x1, double y1, double x2, double y2, double x3, double y3, double x4, double y4)
-{
-    wx_stack_top->x1 = x1;
-    wx_stack_top->y1 = y1;
-    wx_stack_top->x2 = x2;
-    wx_stack_top->y2 = y2;
-    wx_stack_top->x3 = x3;
-    wx_stack_top->y3 = y3;
-    wx_stack_top->x4 = x4;
-    wx_stack_top->y4 = y4;
-    wx_stack_top++;
-    wx_stack_count++;
-}
+        // Don't return the same one as we already have
+        if (!notThis || (notThis != entry))
+        {
+            if (entry->m_depth == depth)
+            {
+                return entry;
+            }
+        }

 
 

-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);
+        node = node->Next();
+    }
+    WXHDC hDC = (WXHDC) ::CreateCompatibleDC((HDC) dc);
+    if ( !hDC)
+    {
+        wxLogLastError(wxT("CreateCompatibleDC"));
+    }
+    wxDCCacheEntry* entry = new wxDCCacheEntry(hDC, depth);
+    AddToDCCache(entry);
+    return entry;

 }
 
 }
 

-static bool wx_spline_add_point(double x, double y)
+void wxDC::AddToBitmapCache(wxDCCacheEntry* entry)

 {
 {

-    wxPoint *point = new wxPoint ;
-    point->x = (int) x;
-    point->y = (int) y;
-    wx_spline_point_list.Append((wxObject*)point);
-    return TRUE;
+    sm_bitmapCache.Append(entry);

 }
 
 }
 

-static void wx_spline_draw_point_array(wxDC *dc)
+void wxDC::AddToDCCache(wxDCCacheEntry* entry)

 {
 {

-    dc->DrawLines(&wx_spline_point_list, 0, 0);
-    wxNode *node = wx_spline_point_list.First();
-    while (node)
-    {
-        wxPoint *point = (wxPoint *)node->Data();
-        delete point;
-        delete node;
-        node = wx_spline_point_list.First();
-    }
+    sm_dcCache.Append(entry);

 }
 
 }
 

-wxSpline::wxSpline(wxList *list)
+void wxDC::ClearCache()

 {
 {

-    points = list;
+    sm_bitmapCache.DeleteContents(TRUE);
+    sm_bitmapCache.Clear();
+    sm_bitmapCache.DeleteContents(FALSE);
+    sm_dcCache.DeleteContents(TRUE);
+    sm_dcCache.Clear();
+    sm_dcCache.DeleteContents(FALSE);

 }
 
 }
 

-wxSpline::~wxSpline(void)
+// Clean up cache at app exit
+class wxDCModule : public wxModule

 {
 {

-}
+public:
+    virtual bool OnInit() { return TRUE; }
+    virtual void OnExit() { wxDC::ClearCache(); }

 
 

-void wxSpline::DeletePoints(void)
-{
-    for(wxNode *node = points->First(); node; node = points->First())
-    {
-        wxPoint *point = (wxPoint *)node->Data();
-        delete point;
-        delete node;
-    }
-    delete points;
-}
+private:
+    DECLARE_DYNAMIC_CLASS(wxDCModule)
+};

 
 

+IMPLEMENT_DYNAMIC_CLASS(wxDCModule, wxModule)

 
 

-#endif // wxUSE_SPLINES
+#endif
+    // wxUSE_DC_CACHEING