corrections for Mac OS X

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

diff --git a/src/msw/dc.cpp b/src/msw/dc.cpp
index bdecb6b626578fdbc59a611104d6821e5d4de4a8..1863a0d1da6daf2dd4d0a87a6112768c110c0b1d 100644 (file)
--- a/src/msw/dc.cpp
+++ b/src/msw/dc.cpp
@@ -6,1359 +6,1573 @@
 // Created:     01/02/97
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart and Markus Holzem
 // Created:     01/02/97
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart and Markus Holzem

-// 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/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
 
 #include "wx/dcprint.h"
 #endif
 
 #include "wx/dcprint.h"

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

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

-#include <fstream.h>

 
 

-#if USE_COMMON_DIALOGS
-#include <commdlg.h>
+#include "wx/msw/private.h" // needs to be before #include <commdlg.h>
+
+#if wxUSE_COMMON_DIALOGS
+    #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;

 
 

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

 
 

-#define YSCALE(y) (yorigin - (y))
+// 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

 
 

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

 
 

-// Default constructor
-wxDC::wxDC(void)
-{
-  m_minX = 0; m_minY = 0; m_maxX = 0; m_maxY = 0;
-  m_clipping = FALSE;
-
-  m_filename = "";
-  m_canvas = NULL;
-  m_oldBitmap = 0;
-  m_oldPen = 0;
-  m_oldBrush = 0;
-  m_oldFont = 0;
-  m_oldPalette = 0;
-  m_minX = 0; m_minY = 0; m_maxX = 0; m_maxY = 0;
-  m_logicalOriginX = 0;
-  m_logicalOriginY = 0;
-  m_deviceOriginX = 0;
-  m_deviceOriginY = 0;
-  m_logicalScaleX = 1.0;
-  m_logicalScaleY = 1.0;
-  m_userScaleX = 1.0;
-  m_userScaleY = 1.0;
-  m_signX = 1;
-  m_signY = 1;
-  m_systemScaleX = 1.0;
-  m_systemScaleY = 1.0;
-  m_mappingMode = MM_TEXT;
-  m_bOwnsDC = FALSE;
-  m_hDC = 0;
-  m_clipping = FALSE;
-  m_ok = TRUE;
-  m_windowExtX = VIEWPORT_EXTENT;
-  m_windowExtY = VIEWPORT_EXTENT;
-  m_logicalFunction = -1;
-
-  m_backgroundBrush = *wxWHITE_BRUSH;
-
-  m_textForegroundColour = *wxBLACK;
-  m_textBackgroundColour = *wxWHITE;
-
-  m_colour = wxColourDisplay();
-
-  m_hDCCount = 0;
-}
-
-
-wxDC::~wxDC(void)
-{
-  if ( m_hDC != 0 ) {
-    SelectOldObjects(m_hDC);
-    if ( m_bOwnsDC ) {
-      if ( m_canvas == NULL )
-        ::DeleteDC((HDC)m_hDC);
-      else
-        ::ReleaseDC((HWND)m_canvas->GetHWND(), (HDC)m_hDC);
-    }
-  }
+// convert degrees to radians
+static inline double DegToRad(double deg) { return (deg * M_PI) / 180.0; }

 
 

-}
+// ----------------------------------------------------------------------------
+// private classes
+// ----------------------------------------------------------------------------

 
 

-// This will select current objects out of the DC,
-// which is what you have to do before deleting the
-// DC.
-void wxDC::SelectOldObjects(WXHDC dc)
+// 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

 {
 {

-#if WXDEBUG > 1
-  wxDebugMsg("wxDC::SelectOldObjects %X\n", this);
-#endif
-  if (dc)
-  {
-    if (m_oldBitmap)
+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 )

     {
     {

-#if WXDEBUG > 1
-      wxDebugMsg("wxDC::SelectOldObjects: Selecting old HBITMAP %X\n", m_oldBitmap);
-#endif
-      ::SelectObject((HDC) dc, (HBITMAP) m_oldBitmap);
-      if (m_selectedBitmap.Ok())
-      {
-        m_selectedBitmap.SetSelectedInto(NULL);
-      }
+        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;

     }
     }

-    m_oldBitmap = 0 ;
-    if (m_oldPen)
+    else

     {
     {

-#if WXDEBUG > 1
-      wxDebugMsg("wxDC::SelectOldObjects: Selecting old HPEN %X\n", m_oldPen);
-#endif
-      ::SelectObject((HDC) dc, (HPEN) m_oldPen);
+        // nothing done, nothing to undo
+        m_changed = FALSE;

     }
     }

-    m_oldPen = 0 ;
-    if (m_oldBrush)
+}
+
+wxColourChanger::~wxColourChanger()
+{
+    if ( m_changed )

     {
     {

-#if WXDEBUG > 1
-      wxDebugMsg("wxDC::SelectOldObjects: Selecting old HBRUSH %X\n", m_oldBrush);
-#endif
-      ::SelectObject((HDC) dc, (HBRUSH) m_oldBrush);
+        // restore the colours we changed
+        HDC hdc = GetHdcOf(m_dc);
+
+        ::SetBkMode(hdc, TRANSPARENT);
+        ::SetTextColor(hdc, m_colFgOld);
+        ::SetBkColor(hdc, m_colBgOld);

     }
     }

-    m_oldBrush = 0 ;
-    if (m_oldFont)
+}
+
+// ---------------------------------------------------------------------------
+// wxDC
+// ---------------------------------------------------------------------------
+
+// Default constructor
+wxDC::wxDC()
+{
+    m_canvas = NULL;
+
+    m_oldBitmap = 0;
+    m_oldPen = 0;
+    m_oldBrush = 0;
+    m_oldFont = 0;
+    m_oldPalette = 0;
+
+    m_bOwnsDC = FALSE;
+    m_hDC = 0;
+
+    m_windowExtX = VIEWPORT_EXTENT;
+    m_windowExtY = VIEWPORT_EXTENT;
+}
+
+
+wxDC::~wxDC()
+{
+    if ( m_hDC != 0 )

     {
     {

-#if WXDEBUG > 1
-      wxDebugMsg("wxDC::SelectOldObjects: Selecting old HFONT %X\n", m_oldFont);
-#endif
-      ::SelectObject((HDC) dc, (HFONT) m_oldFont);
+        SelectOldObjects(m_hDC);
+
+        // if we own the HDC, we delete it, otherwise we just release it
+
+        if ( m_bOwnsDC )
+        {
+            ::DeleteDC(GetHdc());
+        }
+        else // we don't own our HDC
+        {
+            if (m_canvas)
+            {
+                ::ReleaseDC(GetHwndOf(m_canvas), GetHdc());
+            }
+            else
+            {
+                // Must have been a wxScreenDC
+                ::ReleaseDC((HWND) NULL, GetHdc());
+            }
+        }

     }
     }

-    m_oldFont = 0 ;
-    if (m_oldPalette)
+}
+
+// This will select current objects out of the DC,
+// which is what you have to do before deleting the
+// DC.
+void wxDC::SelectOldObjects(WXHDC dc)
+{
+    if (dc)

     {
     {

-#if WXDEBUG > 1
-      wxDebugMsg("wxDC::SelectOldObjects: Selecting old HPALETTE %X\n", m_oldPalette);
-#endif
-      ::SelectPalette((HDC) dc, (HPALETTE) m_oldPalette, TRUE);
+        if (m_oldBitmap)
+        {
+            ::SelectObject((HDC) dc, (HBITMAP) m_oldBitmap);
+            if (m_selectedBitmap.Ok())
+            {
+                m_selectedBitmap.SetSelectedInto(NULL);
+            }
+        }
+        m_oldBitmap = 0;
+        if (m_oldPen)
+        {
+            ::SelectObject((HDC) dc, (HPEN) m_oldPen);
+        }
+        m_oldPen = 0;
+        if (m_oldBrush)
+        {
+            ::SelectObject((HDC) dc, (HBRUSH) m_oldBrush);
+        }
+        m_oldBrush = 0;
+        if (m_oldFont)
+        {
+            ::SelectObject((HDC) dc, (HFONT) m_oldFont);
+        }
+        m_oldFont = 0;
+        if (m_oldPalette)
+        {
+            ::SelectPalette((HDC) dc, (HPALETTE) m_oldPalette, TRUE);
+        }
+        m_oldPalette = 0;

     }
     }

-#if WXDEBUG > 1
-    wxDebugMsg("wxDC::SelectOldObjects: Done.\n");
-#endif
-    m_oldPalette = 0 ;
-  }

 
 

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

 }
 
 }
 

-void wxDC::SetClippingRegion(long cx, long cy, long cw, long ch)
-{
-  m_clipping = TRUE;
-  m_clipX1 = (int)cx;
-  m_clipY1 = (int)cy;
-  m_clipX2 = (int)(cx + cw);
-  m_clipY2 = (int)(cy + ch);
+// ---------------------------------------------------------------------------
+// clipping
+// ---------------------------------------------------------------------------

 
 

-  DoClipping((WXHDC) m_hDC);
+#define DO_SET_CLIPPING_BOX()                   \
+{                                               \
+    RECT rect;                                  \
+                                                \
+    GetClipBox(GetHdc(), &rect);                \
+                                                \
+    m_clipX1 = (wxCoord) XDEV2LOG(rect.left);   \
+    m_clipY1 = (wxCoord) YDEV2LOG(rect.top);    \
+    m_clipX2 = (wxCoord) XDEV2LOG(rect.right);  \
+    m_clipY2 = (wxCoord) YDEV2LOG(rect.bottom); \

 }
 
 }
 

-void wxDC::DoClipping(WXHDC dc)
+void wxDC::DoSetClippingRegion(wxCoord cx, wxCoord cy, wxCoord cw, wxCoord ch)

 {
 {

-  if (m_clipping && dc)
-  {
-    IntersectClipRect((HDC) dc, XLOG2DEV(m_clipX1), YLOG2DEV(m_clipY1),
-                          XLOG2DEV(m_clipX2), YLOG2DEV(m_clipY2));
-  }
+    m_clipping = TRUE;
+    IntersectClipRect(GetHdc(), XLOG2DEV(cx), YLOG2DEV(cy),
+                                XLOG2DEV(cx + cw), YLOG2DEV(cy + ch));
+    DO_SET_CLIPPING_BOX()

 }
 
 }
 

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

 {
 {

-  if (m_clipping && m_hDC)
-  {
-    HRGN rgn = CreateRectRgn(0, 0, 32000, 32000);
-#if WXDEBUG > 1
-    wxDebugMsg("wxDC::DestroyClippingRegion: Selecting HRGN %X\n", rgn);
-#endif
-    SelectClipRgn((HDC) m_hDC, rgn);
-#if WXDEBUG > 1
-    wxDebugMsg("wxDC::DestroyClippingRegion: Deleting HRGN %X\n", rgn);
+    wxCHECK_RET( region.GetHRGN(), wxT("invalid clipping region") );
+
+    m_clipping = TRUE;
+
+#ifdef __WIN16__
+    SelectClipRgn(GetHdc(), (HRGN) region.GetHRGN());
+#else
+    ExtSelectClipRgn(GetHdc(), (HRGN) region.GetHRGN(), RGN_AND);

 #endif
 #endif

-    DeleteObject(rgn);
-   }
-   m_clipping = FALSE;
+
+    DO_SET_CLIPPING_BOX()

 }
 
 }
 

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

 {
 {

-  return TRUE;
+    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(GetHdc(), rgn);
+        DeleteObject(rgn);
+    }
+    m_clipping = FALSE;

 }
 
 }
 

-bool wxDC::CanGetTextExtent(void) const
-{
-  // What sort of display is it?
-  int technology = ::GetDeviceCaps((HDC) m_hDC, TECHNOLOGY);
+// ---------------------------------------------------------------------------
+// query capabilities
+// ---------------------------------------------------------------------------

 
 

-  bool ok;
+bool wxDC::CanDrawBitmap() const
+{
+    return TRUE;
+}

 
 

-  if (technology != DT_RASDISPLAY && technology != DT_RASPRINTER)
-    ok = FALSE;
-  else ok = TRUE;
+bool wxDC::CanGetTextExtent() const
+{
+    // What sort of display is it?
+    int technology = ::GetDeviceCaps(GetHdc(), TECHNOLOGY);

 
 

-  return ok;
+    return (technology == DT_RASDISPLAY) || (technology == DT_RASPRINTER);

 }
 
 }
 

-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;
-  }
+    return (int)::GetDeviceCaps(GetHdc(), BITSPIXEL);
+}

 
 

-  m_palette = m_palette;
+// ---------------------------------------------------------------------------
+// drawing
+// ---------------------------------------------------------------------------

 
 

-  if (!m_palette.Ok())
-  {
-    // Setting a NULL colourmap is a way of restoring
-    // the original colourmap
-    if (m_oldPalette)
+void wxDC::Clear()
+{
+    RECT rect;
+    if ( m_canvas )

     {
     {

-      ::SelectPalette((HDC) m_hDC, (HPALETTE) m_oldPalette, TRUE);
-#if WXDEBUG > 1
-      wxDebugMsg("wxDC::SetPalette: set old palette %X\n", m_oldPalette);
-#endif
-      m_oldPalette = 0;
+        GetClientRect((HWND) m_canvas->GetHWND(), &rect);
+    }
+    else
+    {
+        // No, I think we should simply ignore this if printing on e.g.
+        // a printer DC.
+        // wxCHECK_RET( m_selectedBitmap.Ok(), wxT("this DC can't be cleared") );
+        if (!m_selectedBitmap.Ok())
+            return;
+
+        rect.left = 0; rect.top = 0;
+        rect.right = m_selectedBitmap.GetWidth();
+        rect.bottom = m_selectedBitmap.GetHeight();

     }
 
     }
 

-       return;
-  }
-    
-  if (m_palette.Ok() && m_palette.GetHPALETTE())
-  {
-    HPALETTE oldPal = ::SelectPalette((HDC) m_hDC, (HPALETTE) m_palette.GetHPALETTE(), TRUE);
-    if (!m_oldPalette)
-      m_oldPalette = (WXHPALETTE) oldPal;
-
-#if WXDEBUG > 1
-    wxDebugMsg("wxDC::SetPalette %X: selected palette %X\n", this, m_palette.GetHPALETTE());
-    if (oldPal)
-      wxDebugMsg("wxDC::SetPalette: oldPal was palette %X\n", oldPal);
-    if (m_oldPalette)
-      wxDebugMsg("wxDC::SetPalette: m_oldPalette is palette %X\n", m_oldPalette);
-#endif
-    ::RealizePalette((HDC) m_hDC);
-  }
-}
-
-void wxDC::Clear(void)
-{
-  RECT rect;
-  if (m_canvas)
-    GetClientRect((HWND) m_canvas->GetHWND(), &rect);
-  else if (m_selectedBitmap.Ok())
-  {
-    rect.left = 0; rect.top = 0;
-    rect.right = m_selectedBitmap.GetWidth();
-    rect.bottom = m_selectedBitmap.GetHeight();
-  }
-  (void) ::SetMapMode((HDC) m_hDC, MM_TEXT);
+    (void) ::SetMapMode(GetHdc(), MM_TEXT);

 
 

-  DWORD colour = GetBkColor((HDC) m_hDC);
-  HBRUSH brush = CreateSolidBrush(colour);
-  FillRect((HDC) m_hDC, &rect, brush);
-  DeleteObject(brush);
+    DWORD colour = GetBkColor(GetHdc());
+    HBRUSH brush = CreateSolidBrush(colour);
+    FillRect(GetHdc(), &rect, 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
-                        );
+    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
+    wxCHECK_MSG( col, FALSE, _T("NULL colour parameter in wxDC::GetPixel") );
+
+    // get the color of the pixel
+    COLORREF pixelcolor = ::GetPixel(GetHdc(), XLOG2DEV(x), YLOG2DEV(y));
+
+    wxRGBToColour(*col, pixelcolor);

 
 

-  // get the color of the pixel
-  COLORREF pixelcolor = ::GetPixel((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);
+    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;
+    wxCoord x1 = x-VIEWPORT_EXTENT;
+    wxCoord y1 = y-VIEWPORT_EXTENT;
+    wxCoord x2 = x+VIEWPORT_EXTENT;
+    wxCoord y2 = y+VIEWPORT_EXTENT;

 
 

-      (void)MoveToEx((HDC) m_hDC, XLOG2DEV(x1), YLOG2DEV(y), NULL);
-      (void)LineTo((HDC) m_hDC, XLOG2DEV(x2), YLOG2DEV(y));
+    (void)MoveToEx(GetHdc(), XLOG2DEV(x1), YLOG2DEV(y), NULL);
+    (void)LineTo(GetHdc(), XLOG2DEV(x2), YLOG2DEV(y));

 
 

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

 
 

-  /* MATTHEW: [6] New normalization */
-#if WX_STANDARD_GRAPHICS
-  (void)LineTo((HDC) m_hDC, XLOG2DEV(x2) + 1, YLOG2DEV(y2));
-#endif
+    // 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,double xc,double 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)
-  {
-    DrawEllipse(xc,yc,(double)(radius*2.0),(double)(radius*2)) ;
-    return ;
-  }
+    wxColourChanger cc(*this); // needed for wxSTIPPLE_MASK_OPAQUE handling

 
 

-  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))) ;
+    double dx = xc - x1;
+    double dy = yc - y1;
+    double radius = (double)sqrt(dx*dx+dy*dy);
+    wxCoord r = (wxCoord)radius;

 
 

-  (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)
-  {
-    Pie((HDC) m_hDC,xxx1,yyy1,xxx2,yyy2,
-        xx1,yy1,xx2,yy2) ;
-  }
-  else
-    Arc((HDC) m_hDC,xxx1,yyy1,xxx2,yyy2,
-        xx1,yy1,xx2,yy2) ;
+    // treat the special case of full circle separately
+    if ( x1 == x2 && y1 == y2 )
+    {
+        DrawEllipse(xc - r, yc - r, 2*r, 2*r);
+        return;
+    }
+
+    wxCoord xx1 = XLOG2DEV(x1);
+    wxCoord yy1 = YLOG2DEV(y1);
+    wxCoord xx2 = XLOG2DEV(x2);
+    wxCoord yy2 = YLOG2DEV(y2);
+    wxCoord xxc = XLOG2DEV(xc);
+    wxCoord yyc = YLOG2DEV(yc);
+    wxCoord ray = (wxCoord) sqrt(double((xxc-xx1)*(xxc-xx1)+(yyc-yy1)*(yyc-yy1)));

 
 

-  CalcBoundingBox((xc-radius), (yc-radius));
-  CalcBoundingBox((xc+radius), (yc+radius));
+    wxCoord xxx1 = (wxCoord) (xxc-ray);
+    wxCoord yyy1 = (wxCoord) (yyc-ray);
+    wxCoord xxx2 = (wxCoord) (xxc+ray);
+    wxCoord yyy2 = (wxCoord) (yyc+ray);
+
+    if ( m_brush.Ok() && m_brush.GetStyle() != wxTRANSPARENT )
+    {
+        // Have to add 1 to bottom-right corner of rectangle
+        // to make semi-circles look right (crooked line otherwise).
+        // Unfortunately this is not a reliable method, depends
+        // on the size of shape.
+        // TODO: figure out why this happens!
+        Pie(GetHdc(),xxx1,yyy1,xxx2+1,yyy2+1, xx1,yy1,xx2,yy2);
+    }
+    else
+    {
+        Arc(GetHdc(),xxx1,yyy1,xxx2,yyy2, xx1,yy1,xx2,yy2);
+    }
+
+    CalcBoundingBox(xc - r, yc - r);
+    CalcBoundingBox(xc + r, yc + r);
+}
+
+void wxDC::DoDrawCheckMark(wxCoord x1, wxCoord y1,
+                           wxCoord width, wxCoord height)
+{
+    wxCoord x2 = x1 + width,
+            y2 = y1 + height;
+
+#if defined(__WIN32__) && !defined(__SC__)
+    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);
+    MoveTo(GetHdc(), x1, y1);
+    LineTo(GetHdc(), x2, y2);
+    MoveTo(GetHdc(), x2, y1);
+    LineTo(GetHdc(), x1, y2);
+    ::SelectObject(GetHdc(), hPenOld);
+    ::SelectObject(GetHdc(), hBrushOld);
+    ::DeleteObject(blackPen);
+#endif // Win32/16
+
+    CalcBoundingBox(x1, y1);
+    CalcBoundingBox(x2, y2);
+}
+
+void wxDC::DoDrawPoint(wxCoord x, wxCoord y)
+{
+    COLORREF color = 0x00ffffff;
+    if (m_pen.Ok())
+    {
+        color = m_pen.GetColour().GetPixel();
+    }
+
+    SetPixel(GetHdc(), XLOG2DEV(x), YLOG2DEV(y), color);
+
+    CalcBoundingBox(x, y);

 }
 
 }
 

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

 {
 {

-  COLORREF color = 0x00ffffff;
-  if (m_pen.Ok())
-  {
-    color = m_pen.GetColour().GetPixel() ;
-  }
+    wxColourChanger cc(*this); // needed for wxSTIPPLE_MASK_OPAQUE handling

 
 

-  SetPixel((HDC) m_hDC, XLOG2DEV(x), YLOG2DEV(y), color);
+    // Do things less efficiently if we have offsets
+    if (xoffset != 0 || yoffset != 0)
+    {
+        POINT *cpoints = new POINT[n];
+        int i;
+        for (i = 0; i < n; i++)
+        {
+            cpoints[i].x = (int)(points[i].x + xoffset);
+            cpoints[i].y = (int)(points[i].y + yoffset);
+
+            CalcBoundingBox(cpoints[i].x, cpoints[i].y);
+        }
+        int prev = SetPolyFillMode(GetHdc(),fillStyle==wxODDEVEN_RULE?ALTERNATE:WINDING);
+        (void)Polygon(GetHdc(), cpoints, n);
+        SetPolyFillMode(GetHdc(),prev);
+        delete[] cpoints;
+    }
+    else
+    {
+        int i;
+        for (i = 0; i < n; i++)
+            CalcBoundingBox(points[i].x, points[i].y);

 
 

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

 }
 
 }
 

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

 {
 {

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

     {
     {

-        cpoints[i].x = (int)(points[i].x + xoffset);
-        cpoints[i].y = (int)(points[i].y + yoffset);
-
-        CalcBoundingBox(cpoints[i].x, cpoints[i].y);
+        POINT *cpoints = new POINT[n];
+        int i;
+        for (i = 0; i < n; i++)
+        {
+            cpoints[i].x = (int)(points[i].x + xoffset);
+            cpoints[i].y = (int)(points[i].y + yoffset);
+
+            CalcBoundingBox(cpoints[i].x, cpoints[i].y);
+        }
+        (void)Polyline(GetHdc(), cpoints, n);
+        delete[] cpoints;

     }
     }

-    int prev = SetPolyFillMode((HDC) m_hDC,fillStyle==wxODDEVEN_RULE?ALTERNATE:WINDING) ;
-    (void)Polygon((HDC) m_hDC, cpoints, n);
-    SetPolyFillMode((HDC) m_hDC,prev) ;
-    delete[] cpoints;
-  }
-  else
-  {
-    int i;
-    for (i = 0; i < n; i++)
-        CalcBoundingBox(points[i].x, points[i].y);
-
-    int prev = SetPolyFillMode((HDC) m_hDC,fillStyle==wxODDEVEN_RULE?ALTERNATE:WINDING) ;
-    (void)Polygon((HDC) m_hDC, (POINT*) points, n);
-    SetPolyFillMode((HDC) m_hDC,prev) ;
-  }
-}
-
-void wxDC::DrawLines(int n, wxPoint points[], long xoffset, long yoffset)
-{
-  // Do things less efficiently if we have offsets
-  if (xoffset != 0 || yoffset != 0)
-  {
-    POINT *cpoints = new POINT[n];
-    int i;
-    for (i = 0; i < n; i++)
+    else

     {
     {

-        cpoints[i].x = (int)(points[i].x + xoffset);
-        cpoints[i].y = (int)(points[i].y + yoffset);
+        int i;
+        for (i = 0; i < n; i++)
+            CalcBoundingBox(points[i].x, points[i].y);
+
+        (void)Polyline(GetHdc(), (POINT*) points, n);
+    }
+}

 
 

-        CalcBoundingBox(cpoints[i].x, cpoints[i].y);
+void wxDC::DoDrawRectangle(wxCoord x, wxCoord y, wxCoord width, wxCoord height)
+{
+    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));

     }
     }

-    (void)Polyline((HDC) m_hDC, cpoints, n);
-    delete[] cpoints;
-  }
-  else
-  {
-    int i;
-    for (i = 0; i < n; i++)
-        CalcBoundingBox(points[i].x, points[i].y);

 
 

-    (void)Polyline((HDC) m_hDC, (POINT*) points, n);
-  }
+
+    CalcBoundingBox(x, y);
+    CalcBoundingBox(x2, y2);

 }
 
 }
 

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

 {
 {

-  long x2 = x + width;
-  long y2 = y + height;
+    wxColourChanger cc(*this); // needed for wxSTIPPLE_MASK_OPAQUE handling

 
 

-/* MATTHEW: [6] new normalization */
-#if WX_STANDARD_GRAPHICS
-  bool do_brush, do_pen;
+    // Now, a negative radius value is interpreted to mean
+    // 'the proportion of the smallest X or Y dimension'

 
 

-  do_brush = m_brush.Ok() && m_brush.GetStyle() != wxTRANSPARENT;
-  do_pen = m_pen.Ok() && m_pen.GetStyle() != wxTRANSPARENT;
+    if (radius < 0.0)
+    {
+        double smallest = 0.0;
+        if (width < height)
+            smallest = width;
+        else
+            smallest = height;
+        radius = (- radius * smallest);
+    }

 
 

-  if (do_brush) {
-        HPEN orig_pen = NULL;
+    wxCoord x2 = (x+width);
+    wxCoord y2 = (y+height);

 
 

-        if (do_pen || !m_pen.Ok())
-               orig_pen = (HPEN) ::SelectObject((HDC) m_hDC, (HPEN) ::GetStockObject(NULL_PEN));
+    // Windows draws the filled rectangles without outline (i.e. drawn with a
+    // transparent pen) one pixel smaller in both directions and we want them
+    // to have the same size regardless of which pen is used - adjust
+    if ( m_pen.GetStyle() == wxTRANSPARENT )
+    {
+        x2++;
+        y2++;
+    }

 
 

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

 
 

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

 
 

-        if (do_brush || !m_brush.Ok())
-               orig_brush = (HBRUSH) ::SelectObject((HDC) m_hDC, (HBRUSH) ::GetStockObject(NULL_BRUSH));
+void wxDC::DoDrawEllipse(wxCoord x, wxCoord y, wxCoord width, wxCoord height)
+{
+    wxColourChanger cc(*this); // needed for wxSTIPPLE_MASK_OPAQUE handling

 
 

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

 
 

-        if (do_brush || !m_brush.Ok())
-               ::SelectObject((HDC) m_hDC, orig_brush);
-  }
-#else
-  (void)Rectangle((HDC) m_hDC, XLOG2DEV(x), YLOG2DEV(y), XLOG2DEV(x2), YLOG2DEV(y2));
-#endif
+    (void)Ellipse(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)
+// Chris Breeze 20/5/98: first implementation of DrawEllipticArc on Windows
+void wxDC::DoDrawEllipticArc(wxCoord x,wxCoord y,wxCoord w,wxCoord h,double sa,double ea)

 {
 {

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

 
 

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

     else
     else

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

 
 

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

 
 

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

 
 

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

 }
 
 }
 

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

 {
 {

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

 
 

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

 
 

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

 }
 
 }
 

-// Chris Breeze 20/5/98: first implementation of DrawEllipticArc on Windows
-void wxDC::DrawEllipticArc(long x,long y,long w,long h,double sa,double ea)
-{
-  long x2 = (x+w);
-  long y2 = (y+h);
-
-  const double deg2rad = 3.14159265359 / 180.0;
-  int rx1 = XLOG2DEV(x+w/2);
-  int ry1 = YLOG2DEV(y+h/2);
-  int rx2 = rx1;
-  int ry2 = ry1;
-  rx1 += (int)(100.0 * abs(w) * cos(sa * deg2rad));
-  ry1 -= (int)(100.0 * abs(h) * m_signY * sin(sa * deg2rad));
-  rx2 += (int)(100.0 * abs(w) * cos(ea * deg2rad));
-  ry2 -= (int)(100.0 * abs(h) * m_signY * sin(ea * deg2rad));
-
-  // draw pie with NULL_PEN first and then outline otherwise a line is
-  // drawn from the start and end points to the centre
-  HPEN orig_pen = (HPEN) ::SelectObject((HDC) m_hDC, (HPEN) ::GetStockObject(NULL_PEN));
-  if (m_signY > 0)
-  {
-    (void)Pie((HDC) m_hDC, XLOG2DEV(x), YLOG2DEV(y), XLOG2DEV(x2)+1, YLOG2DEV(y2)+1,
-           rx1, ry1, rx2, ry2);
-  }
-  else
-  {
-    (void)Pie((HDC) m_hDC, XLOG2DEV(x), YLOG2DEV(y)-1, XLOG2DEV(x2)+1, YLOG2DEV(y2),
-           rx1, ry1-1, rx2, ry2-1);
-  }
-  ::SelectObject((HDC) m_hDC, orig_pen);
-  (void)Arc((HDC) m_hDC, XLOG2DEV(x), YLOG2DEV(y), XLOG2DEV(x2), YLOG2DEV(y2),
-         rx1, ry1, rx2, ry2);
-
-  CalcBoundingBox(x, y);
-  CalcBoundingBox(x2, y2);
-}
-
-void wxDC::DrawIcon(const wxIcon& icon, long x, long y)
-{
-  ::DrawIcon((HDC) m_hDC, XLOG2DEV(x), YLOG2DEV(y), (HICON) icon.GetHICON());
-  CalcBoundingBox(x, y);
-  CalcBoundingBox(x+icon.GetWidth(), y+icon.GetHeight());
+void wxDC::DoDrawBitmap( const wxBitmap &bmp, wxCoord x, wxCoord y, bool useMask )
+{
+    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__
+        HDC hdcMem = ::CreateCompatibleDC(GetHdc());
+        ::SelectObject(hdcMem, GetHbitmapOf(bmp));
+
+        // use MaskBlt() with ROP which doesn't do anything to dst in the mask
+        // points
+        bool 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 = GetHdc();
+        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 );
+        ::BitBlt( cdc, x, y, width, height, memdc, 0, 0, SRCCOPY);
+        ::DeleteDC( memdc );
+
+        ::SetTextColor(GetHdc(), old_textground);
+        ::SetBkColor(GetHdc(), old_background);
+    }

 }
 
 }
 

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

 {
 {

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

 
 

-  m_font = the_font;
+    // update the bounding box
+    CalcBoundingBox(x, y);

 
 

-  if (!the_font.Ok())
-  {
-    if (m_oldFont)
-      ::SelectObject((HDC) m_hDC, (HFONT) m_oldFont);
-    m_oldFont = 0 ;
-  }
-
-  if (m_font.Ok() && m_font.GetResourceHandle())
-  {
-#if WXDEBUG > 1
-    wxDebugMsg("wxDC::SetFont: Selecting HFONT %X\n", m_font.GetResourceHandle());
-#endif
-    HFONT f = (HFONT) ::SelectObject((HDC) m_hDC, (HFONT) m_font.GetResourceHandle());
-    if (!m_oldFont)
-      m_oldFont = (WXHFONT) f;
-  }
+    wxCoord w, h;
+    GetTextExtent(text, &w, &h);
+    CalcBoundingBox(x + w, y + h);

 }
 
 }
 

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

 {
 {

-  // Set the old object temporarily, in case the assignment deletes an object
-  // that's not yet selected out.
-  if (m_oldPen)
-  {
-    ::SelectObject((HDC) m_hDC, (HPEN) m_oldPen);
-    m_oldPen = 0;
-  }
+    // prepare for drawing the text
+    if ( m_textForegroundColour.Ok() )
+        SetTextColor(GetHdc(), m_textForegroundColour.GetPixel());

 
 

-  m_pen = pen;
+    DWORD old_background = 0;
+    if ( m_textBackgroundColour.Ok() )
+    {
+        old_background = SetBkColor(GetHdc(), m_textBackgroundColour.GetPixel() );
+    }

 
 

-  if (!m_pen.Ok())
-  {
-    if (m_oldPen)
-      ::SelectObject((HDC) m_hDC, (HPEN) m_oldPen);
-    m_oldPen = 0 ;
-  }
+    SetBkMode(GetHdc(), m_backgroundMode == wxTRANSPARENT ? TRANSPARENT
+                                                          : OPAQUE);

 
 

-  if (m_pen.Ok())
-  {
-    if (m_pen.GetResourceHandle())
+    if ( ::TextOut(GetHdc(), XLOG2DEV(x), YLOG2DEV(y),
+                   text.c_str(), text.length()) == 0 )

     {
     {

-      HPEN p = (HPEN) ::SelectObject((HDC) m_hDC, (HPEN)m_pen.GetResourceHandle()) ;
-      if (!m_oldPen)
-        m_oldPen = (WXHPEN) p;
+        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::SetBrush(const wxBrush& brush)
+void wxDC::DoDrawRotatedText(const wxString& text,
+                             wxCoord x, wxCoord y,
+                             double angle)

 {
 {

-  // Set the old object temporarily, in case the assignment deletes an object
-  // that's not yet selected out.
-  if (m_oldBrush)
-  {
-    ::SelectObject((HDC) m_hDC, (HBRUSH) m_oldBrush);
-    m_oldBrush = 0;
-  }
+    // 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);
+    }
+    else
+    {
+        // NB: don't take DEFAULT_GUI_FONT because it's not TrueType and so
+        //     can't have non zero orientation/escapement
+        wxFont font = m_font.Ok() ? m_font : *wxNORMAL_FONT;
+        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));
+    }
+}

 
 

-  m_brush = brush;
+// ---------------------------------------------------------------------------
+// set GDI objects
+// ---------------------------------------------------------------------------

 
 

-  if (!m_brush.Ok())
-  {
-    if (m_oldBrush)
-      ::SelectObject((HDC) m_hDC, (HBRUSH) m_oldBrush);
-    m_oldBrush = 0 ;
-  }
+void wxDC::SetPalette(const wxPalette& palette)
+{
+    // 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;
+    }

 
 

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

     {
     {

-      HBRUSH b = 0;
-      b = (HBRUSH) ::SelectObject((HDC) m_hDC, (HBRUSH)m_brush.GetResourceHandle()) ;
-      if (!m_oldBrush)
-        m_oldBrush = (WXHBRUSH) b;
+        // 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::DrawText(const wxString& text, long x, long y, bool use16bit)
+void wxDC::SetFont(const wxFont& the_font)

 {
 {

-  if (m_font.Ok() && m_font.GetResourceHandle())
-  {
-#if WXDEBUG > 1
-    wxDebugMsg("wxDC::DrawText: Selecting HFONT %X\n", m_font.GetResourceHandle());
-#endif
-    HFONT f = (HFONT) ::SelectObject((HDC) m_hDC, (HFONT) m_font.GetResourceHandle());
-    if (!m_oldFont)
-      m_oldFont = (WXHFONT) f;
-  }
+    // Set the old object temporarily, in case the assignment deletes an object
+    // that's not yet selected out.
+    if (m_oldFont)
+    {
+        ::SelectObject(GetHdc(), (HFONT) m_oldFont);
+        m_oldFont = 0;
+    }
+
+    m_font = the_font;
+
+    if (!the_font.Ok())
+    {
+        if (m_oldFont)
+            ::SelectObject(GetHdc(), (HFONT) m_oldFont);
+        m_oldFont = 0;
+    }

 
 

-  if (m_textForegroundColour.Ok())
-    SetTextColor((HDC) m_hDC, m_textForegroundColour.GetPixel() ) ;
+    if (m_font.Ok() && m_font.GetResourceHandle())
+    {
+        HFONT f = (HFONT) ::SelectObject(GetHdc(), (HFONT) m_font.GetResourceHandle());
+        if (f == (HFONT) NULL)
+        {
+            wxLogDebug(wxT("::SelectObject failed in wxDC::SetFont."));
+        }
+        if (!m_oldFont)
+            m_oldFont = (WXHFONT) f;
+    }
+}
+
+void wxDC::SetPen(const wxPen& pen)
+{
+    // Set the old object temporarily, in case the assignment deletes an object
+    // that's not yet selected out.
+    if (m_oldPen)
+    {
+        ::SelectObject(GetHdc(), (HPEN) m_oldPen);
+        m_oldPen = 0;
+    }

 
 

-  DWORD old_background;
-  if (m_textBackgroundColour.Ok())
-  {
-    old_background = SetBkColor((HDC) m_hDC, m_textBackgroundColour.GetPixel() ) ;
-  }
+    m_pen = pen;

 
 

-  if (m_backgroundMode == wxTRANSPARENT)
-    SetBkMode((HDC) m_hDC, TRANSPARENT);
-  else
-    SetBkMode((HDC) m_hDC, OPAQUE);
+    if (!m_pen.Ok())
+    {
+        if (m_oldPen)
+            ::SelectObject(GetHdc(), (HPEN) m_oldPen);
+        m_oldPen = 0;
+    }

 
 

-  (void)TextOut((HDC) m_hDC, XLOG2DEV(x), YLOG2DEV(y), (char *) (const char *)text, strlen((const char *)text));
+    if (m_pen.Ok())
+    {
+        if (m_pen.GetResourceHandle())
+        {
+            HPEN p = (HPEN) ::SelectObject(GetHdc(), (HPEN)m_pen.GetResourceHandle());
+            if (!m_oldPen)
+                m_oldPen = (WXHPEN) p;
+        }
+    }
+}

 
 

-  if (m_textBackgroundColour.Ok())
-    (void)SetBkColor((HDC) m_hDC, old_background);
+void wxDC::SetBrush(const wxBrush& brush)
+{
+    // Set the old object temporarily, in case the assignment deletes an object
+    // that's not yet selected out.
+    if (m_oldBrush)
+    {
+        ::SelectObject(GetHdc(), (HBRUSH) m_oldBrush);
+        m_oldBrush = 0;
+    }

 
 

-  CalcBoundingBox(x, y);
+    m_brush = brush;

 
 

-  long w, h;
-  GetTextExtent(text, &w, &h);
-  CalcBoundingBox((x + w), (y + h));
+    if (!m_brush.Ok())
+    {
+        if (m_oldBrush)
+            ::SelectObject(GetHdc(), (HBRUSH) m_oldBrush);
+        m_oldBrush = 0;
+    }
+
+    if (m_brush.Ok())
+    {
+        // 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;
+            b = (HBRUSH) ::SelectObject(GetHdc(), (HBRUSH)m_brush.GetResourceHandle());
+            if (!m_oldBrush)
+                m_oldBrush = (WXHBRUSH) b;
+        }
+    }

 }
 
 void wxDC::SetBackground(const wxBrush& brush)
 {
 }
 
 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 we haven't specified wxUSER_COLOURS, don't allow the panel/dialog box to
-    // change background colours from the control-panel specified colours.
-    if (m_canvas->IsKindOf(CLASSINFO(wxWindow)) && ((m_canvas->GetWindowStyleFlag() & wxUSER_COLOURS) != wxUSER_COLOURS))
-      customColours = FALSE;
-      
-    if (customColours)
+    if (m_canvas)
+    {
+        bool customColours = TRUE;
+        // If we haven't specified wxUSER_COLOURS, don't allow the panel/dialog box to
+        // change background colours from the control-panel specified colours.
+        if (m_canvas->IsKindOf(CLASSINFO(wxWindow)) && ((m_canvas->GetWindowStyleFlag() & wxUSER_COLOURS) != wxUSER_COLOURS))
+            customColours = FALSE;
+
+        if (customColours)
+        {
+            if (m_backgroundBrush.GetStyle()==wxTRANSPARENT)
+            {
+                m_canvas->SetTransparent(TRUE);
+            }
+            else
+            {
+                // New behaviour, 10/2/99: setting the background brush of a DC
+                // doesn't affect the window background colour. However,
+                // I'm leaving in the transparency setting because it's needed by
+                // various controls (e.g. wxStaticText) to determine whether to draw
+                // transparently or not. TODO: maybe this should be a new function
+                // wxWindow::SetTransparency(). Should that apply to the child itself, or the
+                // parent?
+                //        m_canvas->SetBackgroundColour(m_backgroundBrush.GetColour());
+                m_canvas->SetTransparent(FALSE);
+            }
+        }
+    }
+    COLORREF new_color = m_backgroundBrush.GetColour().GetPixel();

     {
     {

-      if (m_backgroundBrush.GetStyle()==wxTRANSPARENT)
-      {
-        m_canvas->m_backgroundTransparent = TRUE;
-      }
-      else
-      {
-        m_canvas->SetBackgroundColour(m_backgroundBrush.GetColour());
-        m_canvas->m_backgroundTransparent = FALSE;
-      }
+        (void)SetBkColor(GetHdc(), new_color);

     }
     }

-  }
-  COLORREF new_color = m_backgroundBrush.GetColour().GetPixel() ;
-  {
-    (void)SetBkColor((HDC) m_hDC, new_color);
-  }

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

-  m_backgroundMode = mode;
+    m_backgroundMode = mode;

 
 

-  if (m_backgroundMode == wxTRANSPARENT)
-    ::SetBkMode((HDC) m_hDC, TRANSPARENT);
-  else
-    ::SetBkMode((HDC) m_hDC, OPAQUE);
+    // SetBackgroundColour now only refers to text background
+    // and m_backgroundMode is used there
+
+/*
+    if (m_backgroundMode == wxTRANSPARENT)
+        ::SetBkMode(GetHdc(), TRANSPARENT);
+    else
+        ::SetBkMode(GetHdc(), OPAQUE);
+       Last change:  AC   29 Jan 101    8:54 pm
+*/

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

-  m_logicalFunction = function;
+    m_logicalFunction = function;

 
 

-  SetRop((WXHDC) m_hDC);
+    SetRop(m_hDC);

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

-  if (!dc || m_logicalFunction < 0)
-    return;
-
-  int c_rop;
-  // These may be wrong
-  switch (m_logicalFunction)
-  {
-//    case wxXOR: c_rop = R2_XORPEN; break;
-    case wxXOR: c_rop = R2_NOTXORPEN; break;
-    case wxINVERT: c_rop = R2_NOT; break;
-    case wxOR_REVERSE: c_rop = R2_MERGEPENNOT; break;
-    case wxAND_REVERSE: c_rop = R2_MASKPENNOT; break;
-    case wxCLEAR: c_rop = R2_WHITE; break;
-    case wxSET: c_rop = R2_BLACK; break;
-    case wxSRC_INVERT: c_rop = R2_NOTCOPYPEN; break;
-    case wxOR_INVERT: c_rop = R2_MERGENOTPEN; break;
-    case wxAND: c_rop = R2_MASKPEN; break;
-    case wxOR: c_rop = R2_MERGEPEN; break;
-    case wxAND_INVERT: c_rop = R2_MASKNOTPEN; break;
-    case wxEQUIV:
-    case wxNAND:
-    case wxCOPY:
-    default:
-      c_rop = R2_COPYPEN; break;
-  }
-  SetROP2((HDC) dc, c_rop);
+    if ( !dc || m_logicalFunction < 0 )
+        return;
+
+    int rop;
+
+    switch (m_logicalFunction)
+    {
+        case wxCLEAR:        rop = R2_BLACK;         break;
+        case wxXOR:          rop = R2_XORPEN;        break;
+        case wxINVERT:       rop = R2_NOT;           break;
+        case wxOR_REVERSE:   rop = R2_MERGEPENNOT;   break;
+        case wxAND_REVERSE:  rop = R2_MASKPENNOT;    break;
+        case wxCOPY:         rop = R2_COPYPEN;       break;
+        case wxAND:          rop = R2_MASKPEN;       break;
+        case wxAND_INVERT:   rop = R2_MASKNOTPEN;    break;
+        case wxNO_OP:        rop = R2_NOP;           break;
+        case wxNOR:          rop = R2_NOTMERGEPEN;   break;
+        case wxEQUIV:        rop = R2_NOTXORPEN;     break;
+        case wxSRC_INVERT:   rop = R2_NOTCOPYPEN;    break;
+        case wxOR_INVERT:    rop = R2_MERGENOTPEN;   break;
+        case wxNAND:         rop = R2_NOTMASKPEN;    break;
+        case wxOR:           rop = R2_MERGEPEN;      break;
+        case wxSET:          rop = R2_WHITE;         break;
+
+        default:
+           wxFAIL_MSG( wxT("unsupported logical function") );
+           return;
+    }
+
+    SetROP2(GetHdc(), rop);

 }
 
 bool wxDC::StartDoc(const wxString& message)
 {
 }
 
 bool wxDC::StartDoc(const wxString& message)
 {

-  if (!this->IsKindOf(CLASSINFO(wxPrinterDC)))
+    // We might be previewing, so return TRUE to let it continue.

     return TRUE;
     return TRUE;

-    
-  bool flag = FALSE;
-
-  DOCINFO docinfo;
-  docinfo.cbSize = sizeof(DOCINFO);
-  docinfo.lpszDocName = (const char *)message;
-  docinfo.lpszOutput = (const char *)m_filename;
-#if defined(__WIN95__)
-  docinfo.lpszDatatype = NULL;
-  docinfo.fwType = 0;
-#endif
-
-  if (m_hDC) flag = (SP_ERROR !=
-#ifndef __WIN32__
-     ::StartDoc((HDC) m_hDC, &docinfo));
-#else
-#ifdef UNICODE
-     ::StartDocW((HDC) m_hDC, &docinfo));
-#else
-     ::StartDocA((HDC) m_hDC, &docinfo));
-#endif
-#endif
-
-  else flag = FALSE;
-
-  return flag;

 }
 
 }
 

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

 {
 {

-  if (!this->IsKindOf(CLASSINFO(wxPrinterDC)))
-    return;
-  if (m_hDC) ::EndDoc((HDC) m_hDC);

 }
 
 }
 

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

 {
 {

-  if (!this->IsKindOf(CLASSINFO(wxPrinterDC)))
-    return;
-  if (m_hDC)
-    ::StartPage((HDC) m_hDC);

 }
 
 }
 

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

 {
 {

-  if (!this->IsKindOf(CLASSINFO(wxPrinterDC)))
-    return;
-  if (m_hDC)
-    ::EndPage((HDC) m_hDC);

 }
 
 }
 

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

 {
 {

-  TEXTMETRIC lpTextMetric;
+    TEXTMETRIC lpTextMetric;

 
 

-  GetTextMetrics((HDC) m_hDC, &lpTextMetric);
+    GetTextMetrics(GetHdc(), &lpTextMetric);

 
 

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

 }
 
 }
 

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

 {
 {

-  TEXTMETRIC lpTextMetric;
+    TEXTMETRIC lpTextMetric;

 
 

-  GetTextMetrics((HDC) m_hDC, &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 *theFont) const

 {
 {

-  wxFont *fontToUse = (wxFont*) theFont;
-  if (!fontToUse)
-    fontToUse = (wxFont*) &m_font;
+    wxFont *fontToUse = (wxFont*) theFont;
+    if (!fontToUse)
+        fontToUse = (wxFont*) &m_font;

 
 

-  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(), WXSTRINGCAST string, wxStrlen(WXSTRINGCAST string), &sizeRect);
+    GetTextMetrics(GetHdc(), &tm);

 
 

-  *x = XDEV2LOGREL(sizeRect.cx);
-  *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;

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

-  m_mappingMode = mode;
-
-  int pixel_width = 0;
-  int pixel_height = 0;
-  int mm_width = 0;
-  int mm_height = 0;
+    m_mappingMode = mode;

 
 

-  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);
+    int pixel_width = 0;
+    int pixel_height = 0;
+    int mm_width = 0;
+    int mm_height = 0;

 
 

-  if ((pixel_width == 0) || (pixel_height == 0) || (mm_width == 0) || (mm_height == 0))
-  {
-    return;
-  }
+    pixel_width = GetDeviceCaps(GetHdc(), HORZRES);
+    pixel_height = GetDeviceCaps(GetHdc(), VERTRES);
+    mm_width = GetDeviceCaps(GetHdc(), HORZSIZE);
+    mm_height = GetDeviceCaps(GetHdc(), VERTSIZE);

 
 

-  double mm2pixelsX = pixel_width/mm_width;
-  double mm2pixelsY = pixel_height/mm_height;
-
-  switch (mode)
-  {
-    case MM_TWIPS:
-    {
-      m_logicalScaleX = (twips2mm * mm2pixelsX);
-      m_logicalScaleY = (twips2mm * mm2pixelsY);
-      break;
-    }
-    case MM_POINTS:
-    {
-      m_logicalScaleX = (pt2mm * mm2pixelsX);
-      m_logicalScaleY = (pt2mm * mm2pixelsY);
-      break;
-    }
-    case MM_METRIC:
+    if ((pixel_width == 0) || (pixel_height == 0) || (mm_width == 0) || (mm_height == 0))

     {
     {

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

     }
     }

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

     {
     {

-      m_logicalScaleX = (mm2pixelsX/10.0);
-      m_logicalScaleY = (mm2pixelsY/10.0);
-      break;
-    }
+    case wxMM_TWIPS:
+        {
+            m_logicalScaleX = (twips2mm * mm2pixelsX);
+            m_logicalScaleY = (twips2mm * mm2pixelsY);
+            break;
+        }
+    case wxMM_POINTS:
+        {
+            m_logicalScaleX = (pt2mm * mm2pixelsX);
+            m_logicalScaleY = (pt2mm * mm2pixelsY);
+            break;
+        }
+    case wxMM_METRIC:
+        {
+            m_logicalScaleX = mm2pixelsX;
+            m_logicalScaleY = mm2pixelsY;
+            break;
+        }
+    case wxMM_LOMETRIC:
+        {
+            m_logicalScaleX = (mm2pixelsX/10.0);
+            m_logicalScaleY = (mm2pixelsY/10.0);
+            break;
+        }

     default:
     default:

-    case MM_TEXT:
-    {
-      m_logicalScaleX = 1.0;
-      m_logicalScaleY = 1.0;
-      break;
+    case wxMM_TEXT:
+        {
+            m_logicalScaleX = 1.0;
+            m_logicalScaleY = 1.0;
+            break;
+        }

     }
     }

-  }

 
 

-  if (::GetMapMode((HDC) m_hDC) != MM_ANISOTROPIC)
-    ::SetMapMode((HDC) m_hDC, MM_ANISOTROPIC);
+    if (::GetMapMode(GetHdc()) != MM_ANISOTROPIC)
+        ::SetMapMode(GetHdc(), MM_ANISOTROPIC);

 
 

-  SetViewportExtEx((HDC) m_hDC, VIEWPORT_EXTENT, VIEWPORT_EXTENT, NULL);
-  m_windowExtX = (int)MS_XDEV2LOGREL(VIEWPORT_EXTENT);
-  m_windowExtY = (int)MS_YDEV2LOGREL(VIEWPORT_EXTENT);
-  ::SetWindowExtEx((HDC) m_hDC, m_windowExtX, m_windowExtY, NULL);
-  ::SetViewportOrgEx((HDC) m_hDC, (int)m_deviceOriginX, (int)m_deviceOriginY, NULL);
-  ::SetWindowOrgEx((HDC) m_hDC, (int)m_logicalOriginX, (int)m_logicalOriginY, NULL);
+    SetViewportExtEx(GetHdc(), VIEWPORT_EXTENT, VIEWPORT_EXTENT, NULL);
+    m_windowExtX = (int)MS_XDEV2LOGREL(VIEWPORT_EXTENT);
+    m_windowExtY = (int)MS_YDEV2LOGREL(VIEWPORT_EXTENT);
+    ::SetWindowExtEx(GetHdc(), m_windowExtX, m_windowExtY, NULL);
+    ::SetViewportOrgEx(GetHdc(), (int)m_deviceOriginX, (int)m_deviceOriginY, NULL);
+    ::SetWindowOrgEx(GetHdc(), (int)m_logicalOriginX, (int)m_logicalOriginY, NULL);

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

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

 
 

-  SetMapMode(m_mappingMode);
+    SetMapMode(m_mappingMode);

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

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

 
 

-  SetMapMode(m_mappingMode);
+    SetMapMode(m_mappingMode);

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

-  m_systemScaleX = x;
-  m_systemScaleY = y;
+    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)

 {
 {

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

 {
 {

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

 
 

-  ::SetViewportOrgEx((HDC) m_hDC, (int)m_deviceOriginX, (int)m_deviceOriginY, NULL);
+    ::SetViewportOrgEx(GetHdc(), (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) ;
-}
+// ---------------------------------------------------------------------------
+// coordinates transformations
+// ---------------------------------------------------------------------------

 
 

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

 {
 {

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

 }
 
 }
 

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

 {
 {

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

 }
 
 }
 

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

 {
 {

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

 }
 
 }
 

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

 {
 {

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

 }
 
 }
 

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

 {
 {

-       return (long) (floor(x)*m_logicalScaleX*m_userScaleX*m_signX*m_systemScaleX) ;
+    return (wxCoord) ((x - m_logicalOriginX)*m_logicalScaleX*m_userScaleX*m_signX*m_scaleX + m_deviceOriginX);

 }
 
 }
 

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

 {
 {

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

 }
 
 }
 

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

 {
 {

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

 }
 
 }
 

-// 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::LogicalToDeviceYRel(wxCoord y) const

 {
 {

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

 }
 
 }
 

-long wxDC::ImplDeviceToLogicalY(long y) const
-{
-//     return (m_scaleGDI ?  y :  DeviceToLogicalY(y));
-       return y;
-}
-
-long wxDC::ImplDeviceToLogicalXRel(long x) const
-{
-//     return (m_scaleGDI ?  x :  DeviceToLogicalXRel(x));
-       return x;
-}
-
-long wxDC::ImplDeviceToLogicalYRel(long y) const
-{
-//     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;
-}
-
-long wxDC::ImplLogicalToDeviceXRel(long x) const
-{
-//     return (m_scaleGDI ?  (floor(double(x))) :  LogicalToDeviceXRel(x));
-       return x;
-}
-
-long wxDC::ImplLogicalToDeviceYRel(long y) const
-{
-//     return (m_scaleGDI ?  (floor(double(y))) :  LogicalToDeviceYRel(y));
-       return y;
-}
+// ---------------------------------------------------------------------------
+// bit blit
+// ---------------------------------------------------------------------------

 
 

-bool wxDC::Blit(long xdest, long ydest, long width, long height,
-                wxDC *source, long xsrc, long ysrc, int rop, bool useMask)
+bool wxDC::DoBlit(wxCoord xdest, wxCoord ydest,
+                  wxCoord width, wxCoord height,
+                  wxDC *source, wxCoord xsrc, wxCoord 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);
-  if (m_textForegroundColour.Ok())
-  {
-       ::SetTextColor((HDC) m_hDC, m_textForegroundColour.GetPixel() ) ;
-  }
-  if (m_textBackgroundColour.Ok())
-  {
-       ::SetBkColor((HDC) m_hDC, 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;
-  if (useMask && source->m_selectedBitmap.Ok() && source->m_selectedBitmap.GetMask())
-  {
+    wxMask *mask = NULL;
+    if ( useMask )
+    {
+        const wxBitmap& bmp = source->m_selectedBitmap;
+        mask = bmp.GetMask();
+
+        if ( !(bmp.Ok() && mask && mask->GetMaskBitmap()) )
+        {
+            // don't give assert here because this would break existing
+            // programs - just silently ignore useMask parameter
+            useMask = FALSE;
+        }
+    }

 
 

-#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))
+    COLORREF old_textground = ::GetTextColor(GetHdc());
+    COLORREF old_background = ::GetBkColor(GetHdc());
+    if (m_textForegroundColour.Ok())

     {
     {

-        // Success
+        ::SetTextColor(GetHdc(), m_textForegroundColour.GetPixel() );

     }
     }

-    else
-#endif
+    if (m_textBackgroundColour.Ok())

     {
     {

-        // 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, 8/5/98
-
-               // 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);
-               ::SelectObject(dc_buffer, 0);
-           ::DeleteDC(dc_buffer);
-               ::DeleteObject(buffer_bmap);
+        ::SetBkColor(GetHdc(), m_textBackgroundColour.GetPixel() );

     }
     }

-  }
-  else
-  {
-      success = (BitBlt((HDC) m_hDC, xdest1, ydest1, (int)width, (int)height, (HDC) source->m_hDC,
-                            xsrc1, ysrc1, dwRop) != 0);
-  }
-  ::SetTextColor((HDC)m_hDC, old_textground);
-  ::SetBkColor((HDC)m_hDC, old_background);
-
-  return success;
-}
-
-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;
-}
-
-void wxDC::GetSizeMM(long *width, long *height) const
-{
-  long w=::GetDeviceCaps((HDC) m_hDC,HORZSIZE);
-  long h=::GetDeviceCaps((HDC) m_hDC,VERTSIZE);
-  *width = w;
-  *height = h;
-}
-
-#if USE_SPLINES
-#include "xfspline.inc"
-#endif // USE_SPLINES

 
 

-void wxDC::DrawPolygon(wxList *list, long xoffset, long yoffset,int fillStyle)
-{
-  int n = list->Number();
-  wxPoint *points = new wxPoint[n];
+    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;
+    }

 
 

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

 
 

-void wxDC::DrawLines(wxList *list, long xoffset, long yoffset)
-{
-  int n = list->Number();
-  wxPoint *points = new wxPoint[n];
+    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)
+        success = ::MaskBlt(GetHdc(), xdest, ydest, width, height,
+                            GetHdcOf(*source), xsrc, ysrc,
+                            (HBITMAP)mask->GetMaskBitmap(), xsrc, ysrc,
+                            MAKEROP4(dwRop, DSTCOPY)) != 0;
+
+        if ( !success )
+#endif // Win32
+        {
+            // Blit bitmap with mask
+
+            // create a temp buffer bitmap and DCs to access it and the mask
+            HDC dc_mask = ::CreateCompatibleDC(GetHdcOf(*source));
+            HDC dc_buffer = ::CreateCompatibleDC(GetHdc());
+            HBITMAP buffer_bmap = ::CreateCompatibleBitmap(GetHdc(), width, height);
+            ::SelectObject(dc_mask, (HBITMAP) mask->GetMaskBitmap());
+            ::SelectObject(dc_buffer, buffer_bmap);
+
+            // copy dest to buffer
+            if ( !::BitBlt(dc_buffer, 0, 0, (int)width, (int)height,
+                           GetHdc(), xdest, ydest, SRCCOPY) )
+            {
+                wxLogLastError(wxT("BitBlt"));
+            }
+
+            // copy src to buffer using selected raster op
+            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, xsrc, ysrc, 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, xsrc, ysrc, 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);
+            ::DeleteDC(dc_mask);
+            ::SelectObject(dc_buffer, 0);
+            ::DeleteDC(dc_buffer);
+            ::DeleteObject(buffer_bmap);
+        }
+    }
+    else // no mask, just BitBlt() it
+    {
+        success = ::BitBlt(GetHdc(), xdest, ydest,
+                           (int)width, (int)height,
+                           GetHdcOf(*source), xsrc, ysrc, dwRop) != 0;
+        if ( !success )
+        {
+            wxLogLastError(wxT("BitBlt"));
+        }
+    }
+    ::SetTextColor(GetHdc(), old_textground);
+    ::SetBkColor(GetHdc(), old_background);

 
 

-  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;
+    return success;

 }
 
 }
 

-void wxDC::SetTextForeground(const wxColour& colour)
+void wxDC::DoGetSize(int *w, int *h) const

 {
 {

-    m_textForegroundColour = colour;
+    if ( w ) *w = ::GetDeviceCaps(GetHdc(), HORZRES);
+    if ( h ) *h = ::GetDeviceCaps(GetHdc(), VERTRES);

 }
 
 }
 

-void wxDC::SetTextBackground(const wxColour& colour)
+void wxDC::DoGetSizeMM(int *w, int *h) const

 {
 {

-    m_textBackgroundColour = colour;
+    if ( w ) *w = ::GetDeviceCaps(GetHdc(), HORZSIZE);
+    if ( h ) *h = ::GetDeviceCaps(GetHdc(), VERTSIZE);

 }
 
 }
 

-#if USE_SPLINES
-// Make a 3-point spline
-void wxDC::DrawSpline(long x1, long y1, long x2, long y2, long x3, long y3)
+wxSize wxDC::GetPPI() const

 {
 {

-  wxList *point_list = new wxList;
-
-  wxPoint *point1 = new wxPoint;
-  point1->x = x1; point1->y = y1;
-  point_list->Append((wxObject*)point1);
-
-  wxPoint *point2 = new wxPoint;
-  point2->x = x2; point2->y = y2;
-  point_list->Append((wxObject*)point2);
-
-  wxPoint *point3 = new wxPoint;
-  point3->x = x3; point3->y = y3;
-  point_list->Append((wxObject*)point3);
+    int x = ::GetDeviceCaps(GetHdc(), LOGPIXELSX);
+    int y = ::GetDeviceCaps(GetHdc(), LOGPIXELSY);

 
 

-  DrawSpline(point_list);
-
-  for(wxNode *node = point_list->First(); node; node = node->Next()) {
-    wxPoint *p = (wxPoint *)node->Data();
-    delete p;
-  }
-  delete point_list;
+    return wxSize(x, y);

 }
 }

-#endif

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

-  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 ;
+    m_logicalScaleX = x;
+    m_logicalScaleY = y;

 }
 
 #if WXWIN_COMPATIBILITY
 }
 
 #if WXWIN_COMPATIBILITY

-void wxDC::GetTextExtent(const wxString& string, float *x, float *y,
-                     float *descent, float *externalLeading,
-                     wxFont *theFont, bool use16bit) const
+void wxDC::DoGetTextExtent(const wxString& string, float *x, float *y,
+                         float *descent, float *externalLeading,
+                         wxFont *theFont, bool use16bit) const

 {
 {

-    long x1, y1, descent1, externalLeading1;
-       GetTextExtent(string, & x1, & y1, & descent1, & externalLeading1, theFont, use16bit);
-       *x = x1; *y = y1;
+    wxCoord x1, y1, descent1, externalLeading1;
+    GetTextExtent(string, & x1, & y1, & descent1, & externalLeading1, theFont, use16bit);
+    *x = x1; *y = y1;

     if (descent)
         *descent = descent1;
     if (externalLeading)
     if (descent)
         *descent = descent1;
     if (externalLeading)


@@ -1366,3 +1580,4 @@ void wxDC::GetTextExtent(const wxString& string, float *x, float *y,
 }
 #endif
 
 }
 #endif
 

+