X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/2bda0e173844e8e0f8acf4e8ad8b5c26e5c6fe5d..9406d962ccf50d63f163896a2dd94123a2a8664a:/src/msw/dc.cpp

diff --git a/src/msw/dc.cpp b/src/msw/dc.cpp
index 9a63615fea..f34b255507 100644
--- a/src/msw/dc.cpp
+++ b/src/msw/dc.cpp
@@ -68,38 +68,17 @@ IMPLEMENT_ABSTRACT_CLASS(wxDC, wxObject)
 // Default constructor
 wxDC::wxDC(void)
 {
-  // Stop internal GDI objects being found and pointers kept
-  // after these objects have been deleted.
-  // No - it's OK; these lists won't return them
-  // because their 'visible' status will be FALSE.
-/*
-  wxTheFontList->RemoveFont(&m_font);
-  wxThePenList->RemovePen(&m_pen);
-  wxTheBrushList->RemoveBrush(&m_brush);
-  wxTheBrushList->RemoveBrush(&m_backgroundBrush);
-*/
-
   m_minX = 0; m_minY = 0; m_maxX = 0; m_maxY = 0;
   m_clipping = FALSE;
-  m_autoSetting = TRUE ;
-//  m_scaleGDI = TRUE;
 
   m_filename = "";
-//  m_selectedBitmap = NULL;
   m_canvas = NULL;
-/*
-  cur_dc = NULL ;
-  cur_bk = 0 ;
-  cur_cpen = NULL ;
-  cur_cbrush = 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_font = NULL;
   m_logicalOriginX = 0;
   m_logicalOriginY = 0;
   m_deviceOriginX = 0;
@@ -108,10 +87,11 @@ wxDC::wxDC(void)
   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_dontDelete = FALSE;
   m_bOwnsDC = FALSE;
   m_hDC = 0;
   m_clipping = FALSE;
@@ -121,7 +101,6 @@ wxDC::wxDC(void)
   m_logicalFunction = -1;
 
   m_backgroundBrush = *wxWHITE_BRUSH;
-//  m_backgroundBrush.UseResource();
 
   m_textForegroundColour = *wxBLACK;
   m_textBackgroundColour = *wxWHITE;
@@ -144,13 +123,6 @@ wxDC::~wxDC(void)
     }
   }
 
-/*
-  if (m_hDC)
-  {
-    SelectOldObjects(m_hDC);
-    ::DeleteDC((HDC) m_hDC);
-  }
-*/
 }
 
 // This will select current objects out of the DC,
@@ -158,14 +130,14 @@ wxDC::~wxDC(void)
 // DC.
 void wxDC::SelectOldObjects(WXHDC dc)
 {
-#if DEBUG > 1
+#if WXDEBUG > 1
   wxDebugMsg("wxDC::SelectOldObjects %X\n", this);
 #endif
   if (dc)
   {
     if (m_oldBitmap)
     {
-#if DEBUG > 1
+#if WXDEBUG > 1
       wxDebugMsg("wxDC::SelectOldObjects: Selecting old HBITMAP %X\n", m_oldBitmap);
 #endif
       ::SelectObject((HDC) dc, (HBITMAP) m_oldBitmap);
@@ -177,7 +149,7 @@ void wxDC::SelectOldObjects(WXHDC dc)
     m_oldBitmap = 0 ;
     if (m_oldPen)
     {
-#if DEBUG > 1
+#if WXDEBUG > 1
       wxDebugMsg("wxDC::SelectOldObjects: Selecting old HPEN %X\n", m_oldPen);
 #endif
       ::SelectObject((HDC) dc, (HPEN) m_oldPen);
@@ -185,7 +157,7 @@ void wxDC::SelectOldObjects(WXHDC dc)
     m_oldPen = 0 ;
     if (m_oldBrush)
     {
-#if DEBUG > 1
+#if WXDEBUG > 1
       wxDebugMsg("wxDC::SelectOldObjects: Selecting old HBRUSH %X\n", m_oldBrush);
 #endif
       ::SelectObject((HDC) dc, (HBRUSH) m_oldBrush);
@@ -193,7 +165,7 @@ void wxDC::SelectOldObjects(WXHDC dc)
     m_oldBrush = 0 ;
     if (m_oldFont)
     {
-#if DEBUG > 1
+#if WXDEBUG > 1
       wxDebugMsg("wxDC::SelectOldObjects: Selecting old HFONT %X\n", m_oldFont);
 #endif
       ::SelectObject((HDC) dc, (HFONT) m_oldFont);
@@ -201,26 +173,16 @@ void wxDC::SelectOldObjects(WXHDC dc)
     m_oldFont = 0 ;
     if (m_oldPalette)
     {
-#if DEBUG > 1
+#if WXDEBUG > 1
       wxDebugMsg("wxDC::SelectOldObjects: Selecting old HPALETTE %X\n", m_oldPalette);
 #endif
       ::SelectPalette((HDC) dc, (HPALETTE) m_oldPalette, TRUE);
     }
-#if DEBUG > 1
+#if WXDEBUG > 1
     wxDebugMsg("wxDC::SelectOldObjects: Done.\n");
 #endif
     m_oldPalette = 0 ;
   }
-/*
-  if (m_font.Ok())
-    m_font.ReleaseResource();
-  if (m_pen.Ok())
-    m_pen.ReleaseResource();
-  if (m_brush.Ok())
-    m_brush.ReleaseResource();
-  if (m_backgroundBrush.Ok())
-    m_backgroundBrush.ReleaseResource();
-*/
 
   m_brush = wxNullBrush ;
   m_pen = wxNullPen;
@@ -238,11 +200,7 @@ void wxDC::SetClippingRegion(long cx, long cy, long cw, long ch)
   m_clipX2 = (int)(cx + cw);
   m_clipY2 = (int)(cy + ch);
 
-  BeginDrawing();
-
   DoClipping((WXHDC) m_hDC);
-
-  EndDrawing();
 }
 
 void wxDC::DoClipping(WXHDC dc)
@@ -251,44 +209,24 @@ void wxDC::DoClipping(WXHDC dc)
   {
     IntersectClipRect((HDC) dc, XLOG2DEV(m_clipX1), YLOG2DEV(m_clipY1),
                           XLOG2DEV(m_clipX2), YLOG2DEV(m_clipY2));
-#if 0
-    int x_off = 0;
-    int y_off = 0;
-    if (m_canvas)
-    {
-      m_canvas->CalcScrolledPosition(0, 0, &x_off, &y_off);
-    }
-//    HRGN rgn = CreateRectRgn(XLOG2DEV(m_clipX1 + x_off), YLOG2DEV(m_clipY1 + y_off),
-//                          XLOG2DEV(m_clipX2 + x_off), YLOG2DEV(m_clipY2 + y_off));
-
-//    SelectClipRgn(dc, rgn);
-//    DeleteObject(rgn);
-    IntersectClipRect((HDC) dc, XLOG2DEV(m_clipX1 + x_off), YLOG2DEV(m_clipY1 + y_off),
-                          XLOG2DEV(m_clipX2 + x_off), YLOG2DEV(m_clipY2 + y_off));
-#endif
   }
 }
 
 void wxDC::DestroyClippingRegion(void)
 {
-  BeginDrawing();
-
   if (m_clipping && m_hDC)
   {
-//        SelectClipRgn(dc, NULL);
     HRGN rgn = CreateRectRgn(0, 0, 32000, 32000);
-#if DEBUG > 1
+#if WXDEBUG > 1
     wxDebugMsg("wxDC::DestroyClippingRegion: Selecting HRGN %X\n", rgn);
 #endif
     SelectClipRgn((HDC) m_hDC, rgn);
-#if DEBUG > 1
+#if WXDEBUG > 1
     wxDebugMsg("wxDC::DestroyClippingRegion: Deleting HRGN %X\n", rgn);
 #endif
     DeleteObject(rgn);
    }
    m_clipping = FALSE;
-
-   EndDrawing();
 }
 
 bool wxDC::CanDrawBitmap(void) const
@@ -312,7 +250,13 @@ bool wxDC::CanGetTextExtent(void) const
 
 void wxDC::SetPalette(const wxPalette& palette)
 {
-  BeginDrawing();
+  // Set the old object temporarily, in case the assignment deletes an object
+  // that's not yet selected out.
+  if (m_oldPalette)
+  {
+    ::SelectPalette((HDC) m_hDC, (HPALETTE) m_oldPalette, TRUE);
+    m_oldPalette = 0;
+  }
 
   m_palette = m_palette;
 
@@ -323,7 +267,7 @@ void wxDC::SetPalette(const wxPalette& palette)
     if (m_oldPalette)
     {
       ::SelectPalette((HDC) m_hDC, (HPALETTE) m_oldPalette, TRUE);
-#if DEBUG > 1
+#if WXDEBUG > 1
       wxDebugMsg("wxDC::SetPalette: set old palette %X\n", m_oldPalette);
 #endif
       m_oldPalette = 0;
@@ -338,7 +282,7 @@ void wxDC::SetPalette(const wxPalette& palette)
     if (!m_oldPalette)
       m_oldPalette = (WXHPALETTE) oldPal;
 
-#if DEBUG > 1
+#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);
@@ -347,14 +291,10 @@ void wxDC::SetPalette(const wxPalette& palette)
 #endif
     ::RealizePalette((HDC) m_hDC);
   }
-
-  EndDrawing();
 }
 
 void wxDC::Clear(void)
 {
-  BeginDrawing();
-
   RECT rect;
   if (m_canvas)
     GetClientRect((HWND) m_canvas->GetHWND(), &rect);
@@ -376,31 +316,16 @@ void wxDC::Clear(void)
   ::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);
-
-  EndDrawing();
 }
 
-void wxDC::FloodFill(long x, long y, wxColour *col, int style)
+void wxDC::FloodFill(long x, long y, const wxColour& col, int style)
 {
-//  int xx = (int)x;
-//  int yy = (int)y;
-
-  if (m_brush.Ok() && m_autoSetting)
-    SetBrush(m_brush);
-
-//  if (m_canvas)
-//    m_canvas->CalcScrolledPosition((int)x, (int)y, &xx, &yy);
-
-  BeginDrawing();
-
   (void)ExtFloodFill((HDC) m_hDC, XLOG2DEV(x), YLOG2DEV(y),
-                        col->GetPixel(),
+                        col.GetPixel(),
                         style==wxFLOOD_SURFACE?
                           FLOODFILLSURFACE:FLOODFILLBORDER
                         );
 
-  EndDrawing();
-
   CalcBoundingBox(x, y);
 }
 
@@ -410,12 +335,6 @@ bool wxDC::GetPixel(long x, long y, wxColour *col) const
   // 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
-/*
-  int xx1 = (int)x;
-  int yy1 = (int)y;
-  if (m_canvas)
-    m_canvas->CalcScrolledPosition((int)x, (int)y, &xx1, &yy1);
-*/
 
   // get the color of the pixel
   COLORREF pixelcolor = ::GetPixel((HDC) m_hDC, XLOG2DEV(x), YLOG2DEV(y));
@@ -437,31 +356,11 @@ bool wxDC::GetPixel(long x, long y, wxColour *col) const
 
 void wxDC::CrossHair(long x, long y)
 {
-      if (m_pen.Ok() && m_autoSetting)
-        SetPen(m_pen);
-
       // We suppose that our screen is 2000x2000 max.
       long x1 = x-2000;
       long y1 = y-2000;
       long x2 = x+2000;
       long y2 = y+2000;
-/*
-      long xx1 = x1 ;
-      long yy1 = y1 ;
-      long xx2 = x2 ;
-      long yy2 = y2 ;
-      long xx  = x ;
-      long yy  = y ;
-
-      if (m_canvas)
-      {
-        m_canvas->CalcScrolledPosition(x1, y1, &xx1, &yy1);
-        m_canvas->CalcScrolledPosition(x2, y2, &xx2, &yy2);
-        m_canvas->CalcScrolledPosition(x, y, &xx, &yy);
-      }
-*/
-
-      BeginDrawing();
 
       (void)MoveToEx((HDC) m_hDC, XLOG2DEV(x1), YLOG2DEV(y), NULL);
       (void)LineTo((HDC) m_hDC, XLOG2DEV(x2), YLOG2DEV(y));
@@ -469,31 +368,12 @@ void wxDC::CrossHair(long x, long y)
       (void)MoveToEx((HDC) m_hDC, XLOG2DEV(x), YLOG2DEV(y1), NULL);
       (void)LineTo((HDC) m_hDC, XLOG2DEV(x), YLOG2DEV(y2));
 
-      EndDrawing();
-
       CalcBoundingBox(x1, y1);
       CalcBoundingBox(x2, y2);
 }
 
 void wxDC::DrawLine(long x1, long y1, long x2, long y2)
 {
-// BUGBUG - is this necessary? YES YES YES YEs Yes yes ye....
-  if (m_pen.Ok() && m_autoSetting)
-    SetPen(m_pen);
-/*
-  int xx1 = (int)x1;
-  int yy1 = (int)y1;
-  int xx2 = (int)x2;
-  int yy2 = (int)y2;
-  if (m_canvas)
-  {
-    m_canvas->CalcScrolledPosition((int)x1, (int)y1, &xx1, &yy1);
-    m_canvas->CalcScrolledPosition((int)x2, (int)y2, &xx2, &yy2);
-  }
-*/
-
-  BeginDrawing();
-
   (void)MoveToEx((HDC) m_hDC, XLOG2DEV(x1), YLOG2DEV(y1), NULL);
   (void)LineTo((HDC) m_hDC, XLOG2DEV(x2), YLOG2DEV(y2));
 
@@ -502,23 +382,12 @@ void wxDC::DrawLine(long x1, long y1, long x2, long y2)
   (void)LineTo((HDC) m_hDC, XLOG2DEV(x2) + 1, YLOG2DEV(y2));
 #endif
 
-  EndDrawing();
-
   CalcBoundingBox(x1, y1);
   CalcBoundingBox(x2, y2);
 }
 
 void wxDC::DrawArc(long x1,long y1,long x2,long y2,double xc,double yc)
 {
-/*
-  int xx1 = (int)x1;
-  int yy1 = (int)y1;
-  int xx2 = (int)x2;
-  int yy2 = (int)y2;
-  int xxc = (int)xc ;
-  int yyc = (int)yc;
-*/
-
   double dx = xc-x1 ;
   double dy = yc-y1 ;
   double radius = (double)sqrt(dx*dx+dy*dy) ;;
@@ -528,21 +397,6 @@ void wxDC::DrawArc(long x1,long y1,long x2,long y2,double xc,double yc)
     return ;
   }
 
-// BUGBUG - is this necessary?
-  if (m_pen.Ok() && m_autoSetting)
-    SetPen(m_pen) ;
-
-/*
-  if (m_canvas)
-  {
-    m_canvas->CalcScrolledPosition((int)x1, (int)y1, &xx1, &yy1);
-    m_canvas->CalcScrolledPosition((int)x2, (int)y2, &xx2, &yy2);
-    m_canvas->CalcScrolledPosition((int)xc, (int)yc, &xxc, &yyc);
-  }
-*/
-
-  BeginDrawing();
-
   long xx1 = XLOG2DEV(x1) ;
   long yy1 = YLOG2DEV(y1) ;
   long xx2 = XLOG2DEV(x2) ;
@@ -558,9 +412,6 @@ void wxDC::DrawArc(long x1,long y1,long x2,long y2,double xc,double yc)
   long yyy2 = (long) (yyc+ray);
   if (m_brush.Ok() && m_brush.GetStyle() !=wxTRANSPARENT)
   {
-// BUGBUG - is this necessary?
-    if (m_brush.GetStyle()!=wxTRANSPARENT&&m_autoSetting)
-      SetBrush(m_brush) ;
     Pie((HDC) m_hDC,xxx1,yyy1,xxx2,yyy2,
         xx1,yy1,xx2,yy2) ;
   }
@@ -568,147 +419,86 @@ void wxDC::DrawArc(long x1,long y1,long x2,long y2,double xc,double yc)
     Arc((HDC) m_hDC,xxx1,yyy1,xxx2,yyy2,
         xx1,yy1,xx2,yy2) ;
 
-  EndDrawing();
-
   CalcBoundingBox((xc-radius), (yc-radius));
   CalcBoundingBox((xc+radius), (yc+radius));
 }
 
-void wxDC::DrawEllipticArc(long WXUNUSED(x),long WXUNUSED(y),long WXUNUSED(w),long WXUNUSED(h),double WXUNUSED(sa),double WXUNUSED(ea))
-{
-  // Not implemented
-}
-
 void wxDC::DrawPoint(long x, long y)
 {
-// BUGBUG - is this necessary?
-  if (m_pen.Ok() && m_autoSetting)
-    SetPen(m_pen) ;
-
-/*
-  int xx1 = (int)x;
-  int yy1 = (int)y;
-  if (m_canvas)
-    m_canvas->CalcScrolledPosition((int)x, (int)y, &xx1, &yy1);
-*/
-
-  BeginDrawing();
-
   COLORREF color = 0x00ffffff;
   if (m_pen.Ok())
   {
-//    m_pen.RealizeResource();
     color = m_pen.GetColour().GetPixel() ;
   }
 
-/*
-    color = RGB(m_pen->GetColour().Red(),
-                m_pen->GetColour().Green(),
-                m_pen->GetColour().Blue());
-*/
-
   SetPixel((HDC) m_hDC, XLOG2DEV(x), YLOG2DEV(y), color);
 
-  EndDrawing();
-
   CalcBoundingBox(x, y);
 }
 
 void wxDC::DrawPolygon(int n, wxPoint points[], long xoffset, long yoffset,int fillStyle)
 {
-// BUGBUG - is this necessary?
-  if (m_pen.Ok() && m_autoSetting)
-    SetPen(m_pen) ;
-/*
-  int xoffset1 = 0;
-  int yoffset1 = 0;
-
-  if (m_canvas)
-    m_canvas->CalcScrolledPosition(0, 0, &xoffset1, &yoffset1);
-
-  xoffset1 += (int)xoffset; yoffset1 += (int)yoffset;
-*/
-
-  BeginDrawing();
-
-  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)(XLOG2DEV(points[i].x));
-    cpoints[i].y = (int)(YLOG2DEV(points[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(points[i].x, points[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) ;
+    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, cpoints, n);
-  SetPolyFillMode((HDC) m_hDC,prev) ;
-
-  EndDrawing();
-
-  delete[] cpoints;
+    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)
 {
-// BUGBUG - is this necessary?
-  if (m_pen.Ok() && m_autoSetting)
-    SetPen(m_pen) ;
-
-/*
-  int xoffset1 = 0;
-  int yoffset1 = 0;
-
-  if (m_canvas)
+  // Do things less efficiently if we have offsets
+  if (xoffset != 0 || yoffset != 0)
   {
-    m_canvas->CalcScrolledPosition(0, 0, &xoffset1, &yoffset1);
-  }
-  xoffset1 += (int)xoffset; yoffset1 += (int)yoffset;
-*/
-
-  BeginDrawing();
+    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);
 
-  POINT *cpoints = new POINT[n];
-  int i;
-  for (i = 0; i < n; i++)
+        CalcBoundingBox(cpoints[i].x, cpoints[i].y);
+    }
+    (void)Polyline((HDC) m_hDC, cpoints, n);
+    delete[] cpoints;
+  }
+  else
   {
-    cpoints[i].x = (int)(XLOG2DEV(points[i].x));
-    cpoints[i].y = (int)(YLOG2DEV(points[i].y));
+    int i;
+    for (i = 0; i < n; i++)
+        CalcBoundingBox(points[i].x, points[i].y);
 
-    CalcBoundingBox(points[i].x, points[i].y);
+    (void)Polyline((HDC) m_hDC, (POINT*) points, n);
   }
-
- (void)Polyline((HDC) m_hDC, cpoints, n);
-
-  EndDrawing();
-
-  delete[] cpoints;
 }
 
 void wxDC::DrawRectangle(long x, long y, long width, long height)
 {
-// BUGBUG - is this necessary?
-  if (m_pen.Ok() && m_autoSetting)
-    SetPen(m_pen) ;
-
-/*
-  int x1 = (int)x;
-  int y1 = (int)y;
-  int x2 = (int)(x+width);
-  int y2 = (int)(y+height);
-
-  if (m_canvas)
-  {
-    m_canvas->CalcScrolledPosition((int)x, (int)y, &x1, &y1);
-    m_canvas->CalcScrolledPosition((int)(x+width), (int)(y+height), &x2, &y2);
-  }
-*/
   long x2 = x + width;
   long y2 = y + height;
 
-  BeginDrawing();
-
 /* MATTHEW: [6] new normalization */
 #if WX_STANDARD_GRAPHICS
   bool do_brush, do_pen;
@@ -720,7 +510,7 @@ void wxDC::DrawRectangle(long x, long y, long width, long height)
 	 HPEN orig_pen = NULL;
 
 	 if (do_pen || !m_pen.Ok())
-		orig_pen = ::SelectObject((HDC) m_hDC, ::GetStockObject(NULL_PEN));
+		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);
@@ -732,7 +522,7 @@ void wxDC::DrawRectangle(long x, long y, long width, long height)
 	 HBRUSH orig_brush = NULL;
 
 	 if (do_brush || !m_brush.Ok())
-		orig_brush = ::SelectObject((HDC) m_hDC, ::GetStockObject(NULL_BRUSH));
+		orig_brush = (HBRUSH) ::SelectObject((HDC) m_hDC, (HBRUSH) ::GetStockObject(NULL_BRUSH));
 
 	 (void)Rectangle((HDC) m_hDC, XLOG2DEV(x), YLOG2DEV(y),
 		  XLOG2DEV(x2), YLOG2DEV(y2));
@@ -746,16 +536,10 @@ void wxDC::DrawRectangle(long x, long y, long width, long height)
 
   CalcBoundingBox(x, y);
   CalcBoundingBox(x2, y2);
-
-  EndDrawing();
 }
 
 void wxDC::DrawRoundedRectangle(long x, long y, long width, long height, double radius)
 {
-// BUGBUG - is this necessary?
-  if (m_pen.Ok() && m_autoSetting)
-    SetPen(m_pen) ;
-
   // Now, a negative radius value is interpreted to mean
   // 'the proportion of the smallest X or Y dimension'
 
@@ -769,87 +553,80 @@ void wxDC::DrawRoundedRectangle(long x, long y, long width, long height, double
     radius = (- radius * smallest);
   }
 
-/*
-  int x1 = (int)x;
-  int y1 = (int)y;
-
-  if (m_canvas)
-  {
-    m_canvas->CalcScrolledPosition((int)x, (int)y, &x1, &y1);
-    m_canvas->CalcScrolledPosition((int)(x+width), (int)(y+height), &x2, &y2);
-  }
-*/
-
   long x2 = (x+width);
   long y2 = (y+height);
 
-  BeginDrawing();
-
   (void)RoundRect((HDC) m_hDC, XLOG2DEV(x), YLOG2DEV(y), XLOG2DEV(x2),
                       YLOG2DEV(y2), 2*XLOG2DEV(radius), 2*YLOG2DEV(radius));
 
   CalcBoundingBox(x, y);
   CalcBoundingBox(x2, y2);
-
-  EndDrawing();
 }
 
 void wxDC::DrawEllipse(long x, long y, long width, long height)
 {
-// BUGBUG - is this necessary?
-  if (m_pen.Ok() && m_autoSetting)
-    SetPen(m_pen) ;
-
-/*
-  int x1 = (int)x;
-  int y1 = (int)y;
-
-  if (m_canvas)
-  {
-    m_canvas->CalcScrolledPosition((int)x, (int)y, &x1, &y1);
-    m_canvas->CalcScrolledPosition((int)(x+width), (int)(y+height), &x2, &y2);
-  }
-*/
-
   long x2 = (x+width);
   long y2 = (y+height);
 
-  BeginDrawing();
-
   (void)Ellipse((HDC) m_hDC, XLOG2DEV(x), YLOG2DEV(y), XLOG2DEV(x2), YLOG2DEV(y2));
 
-  EndDrawing();
-
   CalcBoundingBox(x, y);
   CalcBoundingBox(x2, y2);
 }
 
-void wxDC::DrawIcon(const wxIcon& icon, long x, long y)
+// 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)
 {
-/*
-  int x1 = (int)x;
-  int y1 = (int)y;
+  long x2 = (x+w);
+  long y2 = (y+h);
 
-  if (m_canvas)
-    m_canvas->CalcScrolledPosition(int)x, (int)y, &x1, &y1);
-*/
+  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));
 
-  BeginDrawing();
+  // 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());
-
-  EndDrawing();
 }
 
 void wxDC::SetFont(const wxFont& the_font)
 {
-  // Release the current font from servitude (decrements the usage count)
-//  if (m_font.Ok())
-//    m_font.ReleaseResource();
-
-  BeginDrawing();
+  // 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;
+  }
 
   m_font = the_font;
 
@@ -862,22 +639,24 @@ void wxDC::SetFont(const wxFont& the_font)
 
   if (m_font.Ok() && m_font.GetResourceHandle())
   {
-#if DEBUG > 1
+#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;
   }
-  EndDrawing();
 }
 
 void wxDC::SetPen(const wxPen& pen)
 {
-  BeginDrawing();
-
-//  if (m_pen.Ok())
-//    m_pen.ReleaseResource();
+  // 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;
+  }
 
   m_pen = pen;
 
@@ -890,8 +669,6 @@ void wxDC::SetPen(const wxPen& pen)
 
   if (m_pen.Ok())
   {
-//    m_pen.UseResource();
-//    m_pen.RealizeResource();
     if (m_pen.GetResourceHandle())
     {
       HPEN p = (HPEN) ::SelectObject((HDC) m_hDC, (HPEN)m_pen.GetResourceHandle()) ;
@@ -899,16 +676,17 @@ void wxDC::SetPen(const wxPen& pen)
         m_oldPen = (WXHPEN) p;
     }
   }
-
-  EndDrawing();
 }
 
 void wxDC::SetBrush(const wxBrush& brush)
 {
-  BeginDrawing();
-
-//  if (m_brush.Ok())
-//    m_brush.ReleaseResource();
+  // Set the old object temporarily, in case the assignment deletes an object
+  // that's not yet selected out.
+  if (m_oldBrush)
+  {
+    ::SelectObject((HDC) m_hDC, (HBRUSH) m_oldBrush);
+    m_oldBrush = 0;
+  }
 
   m_brush = brush;
 
@@ -921,38 +699,24 @@ void wxDC::SetBrush(const wxBrush& brush)
 
   if (m_brush.Ok())
   {
-//    m_brush.UseResource();
-//    m_brush.RealizeResource();
-
     if (m_brush.GetResourceHandle())
     {
       HBRUSH b = 0;
-      b = ::SelectObject((HDC) m_hDC, (HBRUSH)m_brush.GetResourceHandle()) ;
+      b = (HBRUSH) ::SelectObject((HDC) m_hDC, (HBRUSH)m_brush.GetResourceHandle()) ;
       if (!m_oldBrush)
         m_oldBrush = (WXHBRUSH) b;
     }
   }
-  EndDrawing();
 }
 
 void wxDC::DrawText(const wxString& text, long x, long y, bool use16bit)
 {
-/*
-  int xx1 = (int)x;
-  int yy1 = (int)y;
-
-  if (m_canvas)
-    m_canvas->CalcScrolledPosition((int)x, (int)y, &xx1, &yy1);
-*/
-
-  BeginDrawing();
-
   if (m_font.Ok() && m_font.GetResourceHandle())
   {
-#if DEBUG > 1
+#if WXDEBUG > 1
     wxDebugMsg("wxDC::DrawText: Selecting HFONT %X\n", m_font.GetResourceHandle());
 #endif
-    HFONT f = ::SelectObject((HDC) m_hDC, (HFONT) m_font.GetResourceHandle());
+    HFONT f = (HFONT) ::SelectObject((HDC) m_hDC, (HFONT) m_font.GetResourceHandle());
     if (!m_oldFont)
       m_oldFont = (WXHFONT) f;
   }
@@ -981,23 +745,15 @@ void wxDC::DrawText(const wxString& text, long x, long y, bool use16bit)
   long w, h;
   GetTextExtent(text, &w, &h);
   CalcBoundingBox((x + w), (y + h));
-
-  EndDrawing();
 }
 
 void wxDC::SetBackground(const wxBrush& brush)
 {
-//  if (m_backgroundBrush.Ok())
-//    m_backgroundBrush.ReleaseResource();
-
   m_backgroundBrush = brush;
 
   if (!m_backgroundBrush.Ok())
     return;
 
-//  m_backgroundBrush.UseResource();
-//  m_backgroundBrush.RealizeResource() ;
-
   if (m_canvas)
   {
     bool customColours = TRUE;
@@ -1008,8 +764,6 @@ void wxDC::SetBackground(const wxBrush& brush)
       
     if (customColours)
     {
-//      HBRUSH br = (m_backgroundBrush.GetStyle()==wxTRANSPARENT) ?
-//                              GetStockObject(NULL_BRUSH) : (HBRUSH) m_backgroundBrush.GetResourceHandle();
       if (m_backgroundBrush.GetStyle()==wxTRANSPARENT)
       {
         m_canvas->m_backgroundTransparent = TRUE;
@@ -1021,39 +775,27 @@ void wxDC::SetBackground(const wxBrush& brush)
       }
     }
   }
-  BeginDrawing();
-
   COLORREF new_color = m_backgroundBrush.GetColour().GetPixel() ;
   {
     (void)SetBkColor((HDC) m_hDC, new_color);
   }
-
-  EndDrawing();
 }
 
 void wxDC::SetBackgroundMode(int mode)
 {
   m_backgroundMode = mode;
 
-  BeginDrawing();
-
   if (m_backgroundMode == wxTRANSPARENT)
     ::SetBkMode((HDC) m_hDC, TRANSPARENT);
   else
     ::SetBkMode((HDC) m_hDC, OPAQUE);
-
-  EndDrawing();
 }
 
 void wxDC::SetLogicalFunction(int function)
 {
   m_logicalFunction = function;
 
-  BeginDrawing();
-
   SetRop((WXHDC) m_hDC);
-
-  EndDrawing();
 }
 
 void wxDC::SetRop(WXHDC dc)
@@ -1172,8 +914,8 @@ void wxDC::GetTextExtent(const wxString& string, long *x, long *y,
   GetTextExtentPoint((HDC) m_hDC, (char *)(const char *) string, strlen((char *)(const char *) string), &sizeRect);
   GetTextMetrics((HDC) m_hDC, &tm);
 
-  *x = XDEV2LOGREL(sizeRect.cx);
-  *y = YDEV2LOGREL(sizeRect.cy);
+  if (x) *x = XDEV2LOGREL(sizeRect.cx);
+  if (y) *y = YDEV2LOGREL(sizeRect.cy);
   if (descent) *descent = tm.tmDescent;
   if (externalLeading) *externalLeading = tm.tmExternalLeading;
 }
@@ -1187,8 +929,6 @@ void wxDC::SetMapMode(int mode)
   int mm_width = 0;
   int mm_height = 0;
 
-  BeginDrawing();
-
   pixel_width = GetDeviceCaps((HDC) m_hDC, HORZRES);
   pixel_height = GetDeviceCaps((HDC) m_hDC, VERTRES);
   mm_width = GetDeviceCaps((HDC) m_hDC, HORZSIZE);
@@ -1196,8 +936,6 @@ void wxDC::SetMapMode(int mode)
 
   if ((pixel_width == 0) || (pixel_height == 0) || (mm_width == 0) || (mm_height == 0))
   {
-//    if (!m_hDC && m_canvas)
-//      m_canvas->ReleaseHDC() ;
     return;
   }
 
@@ -1248,8 +986,6 @@ void wxDC::SetMapMode(int mode)
   ::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);
-
-  EndDrawing();
 }
 
 void wxDC::SetUserScale(double x, double y)
@@ -1260,6 +996,14 @@ void wxDC::SetUserScale(double x, double y)
   SetMapMode(m_mappingMode);
 }
 
+void wxDC::SetAxisOrientation(bool xLeftRight, bool yBottomUp)
+{
+  m_signX = xLeftRight ? 1 : -1;
+  m_signY = yBottomUp ? -1 : 1;
+
+  SetMapMode(m_mappingMode);
+}
+
 void wxDC::SetSystemScale(double x, double y)
 {
   m_systemScaleX = x;
@@ -1273,11 +1017,7 @@ void wxDC::SetLogicalOrigin(long x, long y)
   m_logicalOriginX = x;
   m_logicalOriginY = y;
 
-  BeginDrawing();
-
   ::SetWindowOrgEx((HDC) m_hDC, (int)m_logicalOriginX, (int)m_logicalOriginY, NULL);
-
-  EndDrawing();
 }
 
 void wxDC::SetDeviceOrigin(long x, long y)
@@ -1285,51 +1025,47 @@ void wxDC::SetDeviceOrigin(long x, long y)
   m_deviceOriginX = x;
   m_deviceOriginY = y;
 
-  BeginDrawing();
-
   ::SetViewportOrgEx((HDC) m_hDC, (int)m_deviceOriginX, (int)m_deviceOriginY, NULL);
-
-  EndDrawing();
 }
 
 long wxDC::DeviceToLogicalX(long x) const
 {
-	return (long) (((x) - m_deviceOriginX)/(m_logicalScaleX*m_userScaleX*m_systemScaleX) - m_logicalOriginX) ;
+	return (long) (((x) - m_deviceOriginX)/(m_logicalScaleX*m_userScaleX*m_signX*m_systemScaleX) - m_logicalOriginX) ;
 }
 
 long wxDC::DeviceToLogicalXRel(long x) const
 {
-	return (long) ((x)/(m_logicalScaleX*m_userScaleX*m_systemScaleX)) ;
+	return (long) ((x)/(m_logicalScaleX*m_userScaleX*m_signX*m_systemScaleX)) ;
 }
 
 long wxDC::DeviceToLogicalY(long y) const
 {
-   	return (long) (((y) - m_deviceOriginY)/(m_logicalScaleY*m_userScaleY*m_systemScaleY) - m_logicalOriginY) ;
+   	return (long) (((y) - m_deviceOriginY)/(m_logicalScaleY*m_userScaleY*m_signY*m_systemScaleY) - m_logicalOriginY) ;
 }
 
 long wxDC::DeviceToLogicalYRel(long y) const
 {
-	return (long) ((y)/(m_logicalScaleY*m_userScaleY*m_systemScaleY)) ;
+	return (long) ((y)/(m_logicalScaleY*m_userScaleY*m_signY*m_systemScaleY)) ;
 }
 
 long wxDC::LogicalToDeviceX(long x) const
 {
-	return (long) (floor((x) - m_logicalOriginX)*m_logicalScaleX*m_userScaleX*m_systemScaleX + m_deviceOriginX) ;
+	return (long) (floor((x) - m_logicalOriginX)*m_logicalScaleX*m_userScaleX*m_signX*m_systemScaleX + m_deviceOriginX) ;
 }
 
 long wxDC::LogicalToDeviceXRel(long x) const
 {
-	return (long) (floor(x)*m_logicalScaleX*m_userScaleX*m_systemScaleX) ;
+	return (long) (floor(x)*m_logicalScaleX*m_userScaleX*m_signX*m_systemScaleX) ;
 }
 
 long wxDC::LogicalToDeviceY(long y) const
 {
-	return (long) (floor((y) - m_logicalOriginY)*m_logicalScaleY*m_userScaleY*m_systemScaleY + m_deviceOriginY);
+	return (long) (floor((y) - m_logicalOriginY)*m_logicalScaleY*m_userScaleY*m_signY*m_systemScaleY + m_deviceOriginY);
 }
 
 long wxDC::LogicalToDeviceYRel(long y) const
 {
-	return (long) (floor(y)*m_logicalScaleY*m_userScaleY*m_systemScaleY) ;
+	return (long) (floor(y)*m_logicalScaleY*m_userScaleY*m_signY*m_systemScaleY) ;
 }
 
 // This group of functions may not do any conversion
@@ -1387,14 +1123,24 @@ long wxDC::ImplLogicalToDeviceYRel(long y) const
 bool wxDC::Blit(long xdest, long ydest, long width, long height,
                 wxDC *source, long xsrc, long ysrc, int rop, bool useMask)
 {
-  BeginDrawing();
-  source->BeginDrawing();
-
   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 :
@@ -1435,56 +1181,110 @@ bool wxDC::Blit(long xdest, long ydest, long width, long height,
 	    ::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);
-    }
+        // New code from Chris Breeze, 15/7/98
+		// Blit bitmap with mask
+
+		if (IsKindOf(CLASSINFO(wxPrinterDC)))
+		{
+			// If we are printing source colours are screen colours
+			// not printer colours and so we need copy the bitmap
+			// pixel by pixel.
+			RECT rect;
+			HDC dc_mask = ::CreateCompatibleDC((HDC) source->m_hDC);
+			HDC dc_src = (HDC) source->m_hDC;
+
+			::SelectObject(dc_mask, (HBITMAP) source->m_selectedBitmap.GetMask()->GetMaskBitmap());
+			for (int x = 0; x < width; x++)
+			{
+				for (int y = 0; y < height; y++)
+				{
+					COLORREF cref = ::GetPixel(dc_mask, x, y);
+					if (cref)
+					{
+						HBRUSH brush = ::CreateSolidBrush(::GetPixel(dc_src, x, y));
+						rect.left = xdest1 + x;	rect.right = rect.left + 1;
+						rect.top = ydest1 + y;	rect.bottom = rect.top + 1;
+						::FillRect((HDC) m_hDC, &rect, brush);
+						::DeleteObject(brush);
+					}
+				}
+			}
+			::SelectObject(dc_mask, 0);
+			::DeleteDC(dc_mask);
+		}
+		else
+		{
+			// 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);
+		}
+	}
   }
   else
   {
+	if (IsKindOf(CLASSINFO(wxPrinterDC)))
+	{
+      // If we are printing source colours are screen colours
+      // not printer colours and so we need copy the bitmap
+      // pixel by pixel.
+      HDC dc_src = (HDC) source->m_hDC;
+      RECT rect;
+      for (int x = 0; x < width; x++)
+	  {
+        for (int y = 0; y < height; y++)
+		{
+          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);
+	}
   }
-  source->EndDrawing();
-  EndDrawing();
+  ::SetTextColor((HDC)m_hDC, old_textground);
+  ::SetBkColor((HDC)m_hDC, old_background);
 
   return success;
 }
@@ -1506,11 +1306,7 @@ void wxDC::GetSizeMM(long *width, long *height) const
 }
 
 #if USE_SPLINES
-# if USE_XFIG_SPLINE_CODE
-#  include "../common/xfspline.inc"
-# else
-#  include "../common/wxspline.inc"
-# endif
+#include "xfspline.inc"
 #endif // USE_SPLINES
 
 void wxDC::DrawPolygon(wxList *list, long xoffset, long yoffset,int fillStyle)
@@ -1578,12 +1374,6 @@ void wxDC::DrawSpline(long x1, long y1, long x2, long y2, long x3, long y3)
     delete p;
   }
   delete point_list;
-/*
-  wxSpline spline(point_list);
-
-  wx_draw_open_spline(this, &spline);
-  spline.DeletePoints();
- */
 }
 #endif