bitmap and image updates

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

diff --git a/src/msw/dc.cpp b/src/msw/dc.cpp
index 63727877964d84e3352d17edcbfac7caf7a04cb6..7216cb8f6956b6855c77145e6e3f1ee67fe8cb5a 100644 (file)
--- a/src/msw/dc.cpp
+++ b/src/msw/dc.cpp
@@ -9,120 +9,109 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 

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

 #ifdef __GNUG__
 #ifdef __GNUG__

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

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

-#pragma hdrstop
+    #pragma hdrstop

 #endif
 
 #ifndef WX_PRECOMP
 #endif
 
 #ifndef WX_PRECOMP

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

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

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

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

-#include <commdlg.h>
+#if wxUSE_NORLANDER_HEADERS
+    #include <windows.h>
+#endif
+    #include <commdlg.h>

 #endif
 
 #ifndef __WIN32__
 #endif
 
 #ifndef __WIN32__

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

 #endif
 
 #endif
 

-#ifdef DrawText
-#undef DrawText
-#endif
+#include "wx/msw/private.h"

 
 

-#ifdef GetCharWidth
-#undef GetCharWidth
+#if !USE_SHARED_LIBRARY
+    IMPLEMENT_ABSTRACT_CLASS(wxDC, wxObject)

 #endif
 
 #endif
 

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

 
 

-#if !USE_SHARED_LIBRARY
-IMPLEMENT_ABSTRACT_CLASS(wxDC, wxObject)
-#endif
+static const int VIEWPORT_EXTENT = 1000;

 
 

-// Declarations local to this file
+static const int MM_POINTS = 9;
+static const int MM_METRIC = 10;

 
 

-#define YSCALE(y) (yorigin - (y))
+// ===========================================================================
+// implementation
+// ===========================================================================

 
 

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

 
 // Default constructor
 
 // Default constructor

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

 {
 {

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

     m_canvas = NULL;
     m_canvas = NULL;

+

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

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

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

-    m_clipping = FALSE;
-    m_ok = TRUE;
+

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

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

     m_hDCCount = 0;
 }
 
 
     m_hDCCount = 0;
 }
 
 

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

 {
     if ( m_hDC != 0 ) {
         SelectOldObjects(m_hDC);
         if ( m_bOwnsDC ) {
             if ( m_canvas == NULL )
 {
     if ( m_hDC != 0 ) {
         SelectOldObjects(m_hDC);
         if ( m_bOwnsDC ) {
             if ( m_canvas == NULL )

-                ::DeleteDC((HDC)m_hDC);
+                ::DeleteDC(GetHdc());

             else
             else

-                ::ReleaseDC((HWND)m_canvas->GetHWND(), (HDC)m_hDC);
+                ::ReleaseDC((HWND)m_canvas->GetHWND(), GetHdc());

         }
     }
         }
     }

-    
+

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


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

-        m_oldBitmap = 0 ;
+        m_oldBitmap = 0;

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

-        m_oldPen = 0 ;
+        m_oldPen = 0;

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

-        m_oldBrush = 0 ;
+        m_oldBrush = 0;

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

-        m_oldFont = 0 ;
+        m_oldFont = 0;

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

-        m_oldPalette = 0 ;
+        m_oldPalette = 0;

     }
     }

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

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


@@ -171,34 +160,37 @@ void wxDC::SelectOldObjects(WXHDC dc)
     m_selectedBitmap = wxNullBitmap;
 }
 
     m_selectedBitmap = wxNullBitmap;
 }
 

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

 {
     m_clipping = TRUE;
     m_clipX1 = (int)cx;
     m_clipY1 = (int)cy;
     m_clipX2 = (int)(cx + cw);
     m_clipY2 = (int)(cy + ch);
 {
     m_clipping = TRUE;
     m_clipX1 = (int)cx;
     m_clipY1 = (int)cy;
     m_clipX2 = (int)(cx + cw);
     m_clipY2 = (int)(cy + ch);

-    
+

     DoClipping((WXHDC) m_hDC);
 }
 
     DoClipping((WXHDC) m_hDC);
 }
 

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

 {
 {

-    if (!region.GetHRGN())
-        return;
-    
+    wxCHECK_RET( region.GetHRGN(), wxT("invalid clipping region") );
+

     wxRect box = region.GetBox();
     wxRect box = region.GetBox();

-    
+

     m_clipping = TRUE;
     m_clipX1 = box.x;
     m_clipY1 = box.y;
     m_clipX2 = box.x + box.width;
     m_clipY2 = box.y + box.height;
     m_clipping = TRUE;
     m_clipX1 = box.x;
     m_clipY1 = box.y;
     m_clipX2 = box.x + box.width;
     m_clipY2 = box.y + box.height;

-    
+

 #ifdef __WIN16__
 #ifdef __WIN16__

-    SelectClipRgn((HDC) m_hDC, (HRGN) region.GetHRGN());
+    SelectClipRgn(GetHdc(), (HRGN) region.GetHRGN());

 #else
 #else

-    ExtSelectClipRgn((HDC) m_hDC, (HRGN) region.GetHRGN(), RGN_AND);
+    ExtSelectClipRgn(GetHdc(), (HRGN) region.GetHRGN(), RGN_AND);

 #endif
 }
 
 #endif
 }
 


@@ -207,11 +199,11 @@ void wxDC::DoClipping(WXHDC dc)
     if (m_clipping && dc)
     {
         IntersectClipRect((HDC) dc, XLOG2DEV(m_clipX1), YLOG2DEV(m_clipY1),
     if (m_clipping && dc)
     {
         IntersectClipRect((HDC) dc, XLOG2DEV(m_clipX1), YLOG2DEV(m_clipY1),

-            XLOG2DEV(m_clipX2), YLOG2DEV(m_clipY2));
+                                    XLOG2DEV(m_clipX2), YLOG2DEV(m_clipY2));

     }
 }
 
     }
 }
 

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

 {
     if (m_clipping && m_hDC)
     {
 {
     if (m_clipping && m_hDC)
     {


@@ -219,183 +211,158 @@ void wxDC::DestroyClippingRegion(void)
         // 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);
         // so that OnPaint processing works correctly, and the update clipping region
         // doesn't get destroyed after the first DestroyClippingRegion.
         HRGN rgn = CreateRectRgn(0, 0, 32000, 32000);

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

         DeleteObject(rgn);
     }
     m_clipping = FALSE;
 }
 
         DeleteObject(rgn);
     }
     m_clipping = FALSE;
 }
 

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

 {
     return TRUE;
 }
 
 {
     return TRUE;
 }
 

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

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

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

 }
 
 }
 

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

 {
 {

-    // Set the old object temporarily, in case the assignment deletes an object
-    // that's not yet selected out.
-    if (m_oldPalette)
-    {
-        ::SelectPalette((HDC) m_hDC, (HPALETTE) m_oldPalette, TRUE);
-        m_oldPalette = 0;
-    }
-    
-    m_palette = palette;
-    
-    if (!m_palette.Ok())
-    {
-        // Setting a NULL colourmap is a way of restoring
-        // the original colourmap
-        if (m_oldPalette)
-        {
-            ::SelectPalette((HDC) m_hDC, (HPALETTE) m_oldPalette, TRUE);
-            m_oldPalette = 0;
-        }
-        
-        return;
-    }
-    
-    if (m_palette.Ok() && m_palette.GetHPALETTE())
-    {
-        HPALETTE oldPal = ::SelectPalette((HDC) m_hDC, (HPALETTE) m_palette.GetHPALETTE(), TRUE);
-        if (!m_oldPalette)
-            m_oldPalette = (WXHPALETTE) oldPal;
-        
-        ::RealizePalette((HDC) m_hDC);
-    }
+    return (int)::GetDeviceCaps(GetHdc(), BITSPIXEL);

 }
 
 }
 

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

 {
     RECT rect;
 {
     RECT rect;

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

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

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

     {
     {

+        wxCHECK_RET( m_selectedBitmap.Ok(), wxT("this DC can't be cleared") );
+

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

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

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

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

     DeleteObject(brush);
     DeleteObject(brush);

-    
-    ::SetMapMode((HDC) m_hDC, MM_ANISOTROPIC);
-    ::SetViewportExtEx((HDC) m_hDC, VIEWPORT_EXTENT, VIEWPORT_EXTENT, NULL);
-    ::SetWindowExtEx((HDC) m_hDC, m_windowExtX, m_windowExtY, NULL);
-    ::SetViewportOrgEx((HDC) m_hDC, (int)m_deviceOriginX, (int)m_deviceOriginY, NULL);
-    ::SetWindowOrgEx((HDC) m_hDC, (int)m_logicalOriginX, (int)m_logicalOriginY, NULL);
-}
-
-void wxDC::FloodFill(long x, long y, const wxColour& col, int style)
-{
-    (void)ExtFloodFill((HDC) m_hDC, XLOG2DEV(x), YLOG2DEV(y),
-        col.GetPixel(),
-        style==wxFLOOD_SURFACE?
-FLOODFILLSURFACE:FLOODFILLBORDER
-                 );
-    
+
+    ::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::DoFloodFill(wxCoord x, wxCoord y, const wxColour& col, int style)
+{
+    (void)ExtFloodFill(GetHdc(), XLOG2DEV(x), YLOG2DEV(y),
+                       col.GetPixel(),
+                       style == wxFLOOD_SURFACE ? FLOODFILLSURFACE
+                                                : FLOODFILLBORDER);
+

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

-    
+

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

-    COLORREF pixelcolor = ::GetPixel((HDC) m_hDC, XLOG2DEV(x), YLOG2DEV(y));
+    COLORREF pixelcolor = ::GetPixel(GetHdc(), XLOG2DEV(x), YLOG2DEV(y));

     // get the color of the pen
     COLORREF pencolor = 0x00ffffff;
     if (m_pen.Ok())
     {
     // get the color of the pen
     COLORREF pencolor = 0x00ffffff;
     if (m_pen.Ok())
     {

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

     }
     }

-    
+

     // return the color of the pixel
     if(col)
         col->Set(GetRValue(pixelcolor),GetGValue(pixelcolor),GetBValue(pixelcolor));
     // 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);
 }
 
     // check, if color of the pixels is the same as the color
     // of the current pen
     return(pixelcolor==pencolor);
 }
 

-void wxDC::CrossHair(long x, long y)
-{
-    // We suppose that our screen is 2000x2000 max.
-    long x1 = x-2000;
-    long y1 = y-2000;
-    long x2 = x+2000;
-    long y2 = y+2000;
-    
-    (void)MoveToEx((HDC) m_hDC, XLOG2DEV(x1), YLOG2DEV(y), NULL);
-    (void)LineTo((HDC) m_hDC, XLOG2DEV(x2), YLOG2DEV(y));
-    
-    (void)MoveToEx((HDC) m_hDC, XLOG2DEV(x), YLOG2DEV(y1), NULL);
-    (void)LineTo((HDC) m_hDC, XLOG2DEV(x), YLOG2DEV(y2));
-    
+void wxDC::DoCrossHair(wxCoord x, wxCoord y)
+{
+    wxCoord x1 = x-VIEWPORT_EXTENT;
+    wxCoord y1 = y-VIEWPORT_EXTENT;
+    wxCoord x2 = x+VIEWPORT_EXTENT;
+    wxCoord y2 = y+VIEWPORT_EXTENT;
+
+    (void)MoveToEx(GetHdc(), XLOG2DEV(x1), YLOG2DEV(y), NULL);
+    (void)LineTo(GetHdc(), XLOG2DEV(x2), YLOG2DEV(y));
+
+    (void)MoveToEx(GetHdc(), XLOG2DEV(x), YLOG2DEV(y1), NULL);
+    (void)LineTo(GetHdc(), XLOG2DEV(x), YLOG2DEV(y2));
+

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

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

 {
 {

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

     /* MATTHEW: [6] New normalization */
 #if WX_STANDARD_GRAPHICS
     /* MATTHEW: [6] New normalization */
 #if WX_STANDARD_GRAPHICS

-    (void)LineTo((HDC) m_hDC, XLOG2DEV(x2) + 1, YLOG2DEV(y2));
+    (void)LineTo(GetHdc(), XLOG2DEV(x2) + 1, YLOG2DEV(y2));

 #endif
 #endif

-    
+

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

-void wxDC::DrawArc(long x1,long y1,long x2,long y2, long xc, long yc)
+void wxDC::DoDrawArc(wxCoord x1,wxCoord y1,wxCoord x2,wxCoord y2, wxCoord xc, wxCoord yc)

 {
 {

-    double dx = xc-x1 ;
-    double dy = yc-y1 ;
+    double dx = xc-x1;
+    double dy = yc-y1;

     double radius = (double)sqrt(dx*dx+dy*dy) ;;
     if (x1==x2 && x2==y2)
     {
     double radius = (double)sqrt(dx*dx+dy*dy) ;;
     if (x1==x2 && x2==y2)
     {

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

     }
     }

-    
-    long xx1 = XLOG2DEV(x1) ;
-    long yy1 = YLOG2DEV(y1) ;
-    long xx2 = XLOG2DEV(x2) ;
-    long yy2 = YLOG2DEV(y2) ;
-    long xxc = XLOG2DEV(xc) ;
-    long yyc = YLOG2DEV(yc) ;
-    long ray = (long) sqrt(double((xxc-xx1)*(xxc-xx1)+(yyc-yy1)*(yyc-yy1))) ;
-    
-    (void)MoveToEx((HDC) m_hDC, (int) xx1, (int) yy1, NULL);
-    long xxx1 = (long) (xxc-ray);
-    long yyy1 = (long) (yyc-ray);
-    long xxx2 = (long) (xxc+ray);
-    long yyy2 = (long) (yyc+ray);
+
+    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)));
+
+    (void)MoveToEx(GetHdc(), (int) xx1, (int) yy1, NULL);
+    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
     if (m_brush.Ok() && m_brush.GetStyle() !=wxTRANSPARENT)
     {
         // Have to add 1 to bottom-right corner of rectangle


@@ -403,31 +370,31 @@ void wxDC::DrawArc(long x1,long y1,long x2,long y2, long xc, long yc)
         // Unfortunately this is not a reliable method, depends
         // on the size of shape.
         // TODO: figure out why this happens!
         // Unfortunately this is not a reliable method, depends
         // on the size of shape.
         // TODO: figure out why this happens!

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

     }
     else
     }
     else

-        Arc((HDC) m_hDC,xxx1,yyy1,xxx2,yyy2,
-        xx1,yy1,xx2,yy2) ;
-    
-    CalcBoundingBox((xc-radius), (yc-radius));
-    CalcBoundingBox((xc+radius), (yc+radius));
+        Arc(GetHdc(),xxx1,yyy1,xxx2,yyy2,
+        xx1,yy1,xx2,yy2);
+
+    CalcBoundingBox((wxCoord)(xc-radius), (wxCoord)(yc-radius));
+    CalcBoundingBox((wxCoord)(xc+radius), (wxCoord)(yc+radius));

 }
 
 }
 

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

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

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

     }
     }

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

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

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

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


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

-            
+

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

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

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


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

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

     }
 }
 
     }
 }
 

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

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


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

-            
+

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

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

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


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

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

     }
 }
 
     }
 }
 

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

 {
 {

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

     /* MATTHEW: [6] new normalization */
 #if WX_STANDARD_GRAPHICS
     bool do_brush, do_pen;
     /* MATTHEW: [6] new normalization */
 #if WX_STANDARD_GRAPHICS
     bool do_brush, do_pen;

-    
+

     do_brush = m_brush.Ok() && m_brush.GetStyle() != wxTRANSPARENT;
     do_pen = m_pen.Ok() && m_pen.GetStyle() != wxTRANSPARENT;
     do_brush = m_brush.Ok() && m_brush.GetStyle() != wxTRANSPARENT;
     do_pen = m_pen.Ok() && m_pen.GetStyle() != wxTRANSPARENT;

-    
+

     if (do_brush) {
         HPEN orig_pen = NULL;
     if (do_brush) {
         HPEN orig_pen = NULL;

-        
+

         if (do_pen || !m_pen.Ok())
         if (do_pen || !m_pen.Ok())

-            orig_pen = (HPEN) ::SelectObject((HDC) m_hDC, (HPEN) ::GetStockObject(NULL_PEN));
-        
-        (void)Rectangle((HDC) m_hDC, XLOG2DEV(x), YLOG2DEV(y),
+            orig_pen = (HPEN) ::SelectObject(GetHdc(), (HPEN) ::GetStockObject(NULL_PEN));
+
+        (void)Rectangle(GetHdc(), XLOG2DEV(x), YLOG2DEV(y),

             XLOG2DEV(x2) + 1, YLOG2DEV(y2) + 1);
             XLOG2DEV(x2) + 1, YLOG2DEV(y2) + 1);

-        
+

         if (do_pen || !m_pen.Ok())
         if (do_pen || !m_pen.Ok())

-            ::SelectObject((HDC) m_hDC , orig_pen);
+            ::SelectObject(GetHdc() , orig_pen);

     }
     if (do_pen) {
         HBRUSH orig_brush = NULL;
     }
     if (do_pen) {
         HBRUSH orig_brush = NULL;

-        
+

         if (do_brush || !m_brush.Ok())
         if (do_brush || !m_brush.Ok())

-            orig_brush = (HBRUSH) ::SelectObject((HDC) m_hDC, (HBRUSH) ::GetStockObject(NULL_BRUSH));
-        
-        (void)Rectangle((HDC) m_hDC, XLOG2DEV(x), YLOG2DEV(y),
+            orig_brush = (HBRUSH) ::SelectObject(GetHdc(), (HBRUSH) ::GetStockObject(NULL_BRUSH));
+
+        (void)Rectangle(GetHdc(), XLOG2DEV(x), YLOG2DEV(y),

             XLOG2DEV(x2), YLOG2DEV(y2));
             XLOG2DEV(x2), YLOG2DEV(y2));

-        
+

         if (do_brush || !m_brush.Ok())
         if (do_brush || !m_brush.Ok())

-            ::SelectObject((HDC) m_hDC, orig_brush);
+            ::SelectObject(GetHdc(), orig_brush);

     }
 #else
     }
 #else

-    (void)Rectangle((HDC) m_hDC, XLOG2DEV(x), YLOG2DEV(y), XLOG2DEV(x2), YLOG2DEV(y2));
+    (void)Rectangle(GetHdc(), XLOG2DEV(x), YLOG2DEV(y), XLOG2DEV(x2), YLOG2DEV(y2));

 #endif
 #endif

-    
+

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

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

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

-    
+

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


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

-    
-    long x2 = (x+width);
-    long y2 = (y+height);
-    
-    (void)RoundRect((HDC) m_hDC, XLOG2DEV(x), YLOG2DEV(y), XLOG2DEV(x2),
-        YLOG2DEV(y2), 2*XLOG2DEV(radius), 2*YLOG2DEV(radius));
-    
+
+    wxCoord x2 = (x+width);
+    wxCoord y2 = (y+height);
+
+    (void)RoundRect(GetHdc(), XLOG2DEV(x), YLOG2DEV(y), XLOG2DEV(x2),
+        YLOG2DEV(y2), (int) (2*XLOG2DEV(radius)), (int)( 2*YLOG2DEV(radius)));
+

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

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

 {
 {

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

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

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

 {
 {

-    long x2 = (x+w);
-    long y2 = (y+h);
-    
+    wxCoord x2 = (x+w);
+    wxCoord y2 = (y+h);
+

     const double deg2rad = 3.14159265359 / 180.0;
     int rx1 = XLOG2DEV(x+w/2);
     int ry1 = YLOG2DEV(y+h/2);
     const double deg2rad = 3.14159265359 / 180.0;
     int rx1 = XLOG2DEV(x+w/2);
     int ry1 = YLOG2DEV(y+h/2);


@@ -580,56 +547,58 @@ void wxDC::DrawEllipticArc(long x,long y,long w,long h,double sa,double ea)
     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));
     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
     // draw pie with NULL_PEN first and then outline otherwise a line is
     // drawn from the start and end points to the centre

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

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

-        (void)Pie((HDC) m_hDC, XLOG2DEV(x), YLOG2DEV(y), XLOG2DEV(x2)+1, YLOG2DEV(y2)+1,
+        (void)Pie(GetHdc(), XLOG2DEV(x), YLOG2DEV(y), XLOG2DEV(x2)+1, YLOG2DEV(y2)+1,

             rx1, ry1, rx2, ry2);
     }
     else
     {
             rx1, ry1, rx2, ry2);
     }
     else
     {

-        (void)Pie((HDC) m_hDC, XLOG2DEV(x), YLOG2DEV(y)-1, XLOG2DEV(x2)+1, YLOG2DEV(y2),
+        (void)Pie(GetHdc(), XLOG2DEV(x), YLOG2DEV(y)-1, XLOG2DEV(x2)+1, YLOG2DEV(y2),

             rx1, ry1-1, rx2, ry2-1);
     }
             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),
+    ::SelectObject(GetHdc(), orig_pen);
+    (void)Arc(GetHdc(), XLOG2DEV(x), YLOG2DEV(y), XLOG2DEV(x2), YLOG2DEV(y2),

         rx1, ry1, rx2, ry2);
         rx1, ry1, rx2, ry2);

-    
+

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

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

 {
 #if defined(__WIN32__) && !defined(__SC__) && !defined(__TWIN32__)
 {
 #if defined(__WIN32__) && !defined(__SC__) && !defined(__TWIN32__)

-    ::DrawIconEx((HDC) m_hDC, XLOG2DEV(x), YLOG2DEV(y), (HICON) icon.GetHICON(),
+    ::DrawIconEx(GetHdc(), XLOG2DEV(x), YLOG2DEV(y), (HICON) icon.GetHICON(),

         icon.GetWidth(), icon.GetHeight(), 0, 0, DI_NORMAL);
 #else
         icon.GetWidth(), icon.GetHeight(), 0, 0, DI_NORMAL);
 #else

-    ::DrawIcon((HDC) m_hDC, XLOG2DEV(x), YLOG2DEV(y), (HICON) icon.GetHICON());
+    ::DrawIcon(GetHdc(), XLOG2DEV(x), YLOG2DEV(y), (HICON) icon.GetHICON());

 #endif
 #endif

-    
+

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

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

 {
     if (!bmp.Ok())
         return;
 {
     if (!bmp.Ok())
         return;

-    
+

     // If we're not drawing transparently, and not drawing to a printer,
     // optimize this function to use Windows functions.
     if (!useMask && !IsKindOf(CLASSINFO(wxPrinterDC)))
     {
     // If we're not drawing transparently, and not drawing to a printer,
     // optimize this function to use Windows functions.
     if (!useMask && !IsKindOf(CLASSINFO(wxPrinterDC)))
     {

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

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

+
+        wxASSERT_MSG( hbitmap, wxT("bitmap is ok but HBITMAP is NULL?") );
+

         ::SelectObject( memdc, hbitmap );
         ::BitBlt( cdc, x, y, bmp.GetWidth(), bmp.GetHeight(), memdc, 0, 0, SRCCOPY);
         ::SelectObject( memdc, hbitmap );
         ::BitBlt( cdc, x, y, bmp.GetWidth(), bmp.GetHeight(), memdc, 0, 0, SRCCOPY);

-        ::SelectObject( memdc, 0 );

         ::DeleteDC( memdc );
     }
     else
         ::DeleteDC( memdc );
     }
     else


@@ -637,7 +606,7 @@ void wxDC::DrawBitmap( const wxBitmap &bmp, long x, long y, bool useMask )
         // Rather than reproduce wxDC::Blit, let's do it at the wxWin API level
         wxMemoryDC memDC;
         memDC.SelectObject(bmp);
         // Rather than reproduce wxDC::Blit, let's do it at the wxWin API level
         wxMemoryDC memDC;
         memDC.SelectObject(bmp);

-        
+

         /* Not sure if we need this. The mask should leave the
         * masked areas as per the original background of this DC.
         */
         /* Not sure if we need this. The mask should leave the
         * masked areas as per the original background of this DC.
         */


@@ -647,38 +616,109 @@ void wxDC::DrawBitmap( const wxBitmap &bmp, long x, long y, bool useMask )
         memDC.SetBackground(* GetBackground());
         memDC.Clear();
         */
         memDC.SetBackground(* GetBackground());
         memDC.Clear();
         */

-        
+

         Blit(x, y, bmp.GetWidth(), bmp.GetHeight(), & memDC, 0, 0, wxCOPY, useMask);
         Blit(x, y, bmp.GetWidth(), bmp.GetHeight(), & memDC, 0, 0, wxCOPY, useMask);

-        
+

         memDC.SelectObject(wxNullBitmap);
     }
 }
 
         memDC.SelectObject(wxNullBitmap);
     }
 }
 

+void wxDC::DoDrawText(const wxString& text, wxCoord x, wxCoord y)
+{
+    if (m_textForegroundColour.Ok())
+        SetTextColor(GetHdc(), m_textForegroundColour.GetPixel() );
+
+    DWORD old_background = 0;
+    if (m_textBackgroundColour.Ok())
+    {
+        old_background = SetBkColor(GetHdc(), m_textBackgroundColour.GetPixel() );
+    }
+
+    if (m_backgroundMode == wxTRANSPARENT)
+        SetBkMode(GetHdc(), TRANSPARENT);
+    else
+        SetBkMode(GetHdc(), OPAQUE);
+
+    (void)TextOut(GetHdc(), XLOG2DEV(x), YLOG2DEV(y), WXSTRINGCAST text, wxStrlen(WXSTRINGCAST text));
+
+    if (m_textBackgroundColour.Ok())
+        (void)SetBkColor(GetHdc(), old_background);
+
+    // background colour is used only for DrawText, otherwise
+    // always TRANSPARENT, RR
+    SetBkMode(GetHdc(), TRANSPARENT);
+
+    CalcBoundingBox(x, y);
+
+    wxCoord w, h;
+    GetTextExtent(text, &w, &h);
+    CalcBoundingBox((x + w), (y + h));
+}
+
+// ---------------------------------------------------------------------------
+// set GDI objects
+// ---------------------------------------------------------------------------
+
+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;
+    }
+
+    m_palette = palette;
+
+    if (!m_palette.Ok())
+    {
+        // Setting a NULL colourmap is a way of restoring
+        // the original colourmap
+        if (m_oldPalette)
+        {
+            ::SelectPalette(GetHdc(), (HPALETTE) m_oldPalette, TRUE);
+            m_oldPalette = 0;
+        }
+
+        return;
+    }
+
+    if (m_palette.Ok() && m_palette.GetHPALETTE())
+    {
+        HPALETTE oldPal = ::SelectPalette(GetHdc(), (HPALETTE) m_palette.GetHPALETTE(), TRUE);
+        if (!m_oldPalette)
+            m_oldPalette = (WXHPALETTE) oldPal;
+
+        ::RealizePalette(GetHdc());
+    }
+}
+

 void wxDC::SetFont(const wxFont& the_font)
 {
     // Set the old object temporarily, in case the assignment deletes an object
     // that's not yet selected out.
     if (m_oldFont)
     {
 void wxDC::SetFont(const wxFont& the_font)
 {
     // Set the old object temporarily, in case the assignment deletes an object
     // that's not yet selected out.
     if (m_oldFont)
     {

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

         m_oldFont = 0;
     }
         m_oldFont = 0;
     }

-    
+

     m_font = the_font;
     m_font = the_font;

-    
+

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

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

     }
     }

-    
+

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

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

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

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

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


@@ -691,24 +731,24 @@ void wxDC::SetPen(const wxPen& pen)
     // that's not yet selected out.
     if (m_oldPen)
     {
     // that's not yet selected out.
     if (m_oldPen)
     {

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

         m_oldPen = 0;
     }
         m_oldPen = 0;
     }

-    
+

     m_pen = pen;
     m_pen = pen;

-    
+

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

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

     }
     }

-    
+

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

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

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


@@ -721,76 +761,38 @@ void wxDC::SetBrush(const wxBrush& brush)
     // that's not yet selected out.
     if (m_oldBrush)
     {
     // that's not yet selected out.
     if (m_oldBrush)
     {

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

         m_oldBrush = 0;
     }
         m_oldBrush = 0;
     }

-    
+

     m_brush = brush;
     m_brush = brush;

-    
+

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

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

     }
     }

-    
+

     if (m_brush.Ok())
     {
         if (m_brush.GetResourceHandle())
         {
             HBRUSH b = 0;
     if (m_brush.Ok())
     {
         if (m_brush.GetResourceHandle())
         {
             HBRUSH b = 0;

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

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

-void wxDC::DrawText(const wxString& text, long x, long y, bool use16bit)
-{
-    // Should be unnecessary: SetFont should have done this already.
-#if 0
-    if (m_font.Ok() && m_font.GetResourceHandle())
-    {
-        HFONT f = (HFONT) ::SelectObject((HDC) m_hDC, (HFONT) m_font.GetResourceHandle());
-        if (!m_oldFont)
-            m_oldFont = (WXHFONT) f;
-    }
-#endif
-    
-    if (m_textForegroundColour.Ok())
-        SetTextColor((HDC) m_hDC, m_textForegroundColour.GetPixel() ) ;
-    
-    DWORD old_background = 0;
-    if (m_textBackgroundColour.Ok())
-    {
-        old_background = SetBkColor((HDC) m_hDC, m_textBackgroundColour.GetPixel() ) ;
-    }
-    
-    if (m_backgroundMode == wxTRANSPARENT)
-        SetBkMode((HDC) m_hDC, TRANSPARENT);
-    else
-        SetBkMode((HDC) m_hDC, OPAQUE);
-    
-    (void)TextOut((HDC) m_hDC, XLOG2DEV(x), YLOG2DEV(y), (char *) (const char *)text, strlen((const char *)text));
-    
-    if (m_textBackgroundColour.Ok())
-        (void)SetBkColor((HDC) m_hDC, old_background);
-    
-    CalcBoundingBox(x, y);
-    
-    long w, h;
-    GetTextExtent(text, &w, &h);
-    CalcBoundingBox((x + w), (y + h));
-}
-

 void wxDC::SetBackground(const wxBrush& brush)
 {
     m_backgroundBrush = brush;
 void wxDC::SetBackground(const wxBrush& brush)
 {
     m_backgroundBrush = brush;

-    
+

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

-    
+

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


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

-        
+

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

-                m_canvas->m_backgroundTransparent = TRUE;
+                m_canvas->SetTransparent(TRUE);

             }
             else
             {
             }
             else
             {


@@ -815,30 +817,35 @@ void wxDC::SetBackground(const wxBrush& brush)
                 // wxWindow::SetTransparency(). Should that apply to the child itself, or the
                 // parent?
                 //        m_canvas->SetBackgroundColour(m_backgroundBrush.GetColour());
                 // wxWindow::SetTransparency(). Should that apply to the child itself, or the
                 // parent?
                 //        m_canvas->SetBackgroundColour(m_backgroundBrush.GetColour());

-                m_canvas->m_backgroundTransparent = FALSE;
+                m_canvas->SetTransparent(FALSE);

             }
         }
     }
             }
         }
     }

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

     {
     {

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

     }
 }
 
 void wxDC::SetBackgroundMode(int mode)
 {
     m_backgroundMode = mode;
     }
 }
 
 void wxDC::SetBackgroundMode(int mode)
 {
     m_backgroundMode = mode;

-    
+
+    // SetBackgroundColour now only refers to text background
+    // and m_backgroundMode is used there
+
+/*

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

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

     else
     else

-        ::SetBkMode((HDC) m_hDC, OPAQUE);
+       ::SetBkMode(GetHdc(), OPAQUE);
+*/

 }
 
 void wxDC::SetLogicalFunction(int function)
 {
     m_logicalFunction = function;
 }
 
 void wxDC::SetLogicalFunction(int function)
 {
     m_logicalFunction = function;

-    
+

     SetRop((WXHDC) m_hDC);
 }
 
     SetRop((WXHDC) m_hDC);
 }
 


@@ -846,7 +853,7 @@ void wxDC::SetRop(WXHDC dc)
 {
     if (!dc || m_logicalFunction < 0)
         return;
 {
     if (!dc || m_logicalFunction < 0)
         return;

-    
+

     int c_rop;
     // These may be wrong
     switch (m_logicalFunction)
     int c_rop;
     // These may be wrong
     switch (m_logicalFunction)


@@ -878,49 +885,54 @@ bool wxDC::StartDoc(const wxString& message)
     return TRUE;
 }
 
     return TRUE;
 }
 

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

 {
 }
 
 {
 }
 

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

 {
 }
 
 {
 }
 

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

 {
 }
 
 {
 }
 

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

 {
     TEXTMETRIC lpTextMetric;
 {
     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);
+

     if (x) *x = XDEV2LOGREL(sizeRect.cx);
     if (y) *y = YDEV2LOGREL(sizeRect.cy);
     if (descent) *descent = tm.tmDescent;
     if (x) *x = XDEV2LOGREL(sizeRect.cx);
     if (y) *y = YDEV2LOGREL(sizeRect.cy);
     if (descent) *descent = tm.tmDescent;


@@ -930,25 +942,25 @@ void wxDC::GetTextExtent(const wxString& string, long *x, long *y,
 void wxDC::SetMapMode(int mode)
 {
     m_mappingMode = 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;
     int pixel_width = 0;
     int pixel_height = 0;
     int mm_width = 0;
     int mm_height = 0;

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

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

-    
+

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

-    
+

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


@@ -983,23 +995,23 @@ void wxDC::SetMapMode(int mode)
             break;
         }
     }
             break;
         }
     }

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

     m_windowExtX = (int)MS_XDEV2LOGREL(VIEWPORT_EXTENT);
     m_windowExtY = (int)MS_YDEV2LOGREL(VIEWPORT_EXTENT);
     m_windowExtX = (int)MS_XDEV2LOGREL(VIEWPORT_EXTENT);
     m_windowExtY = (int)MS_YDEV2LOGREL(VIEWPORT_EXTENT);

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

 }
 
 void wxDC::SetUserScale(double x, double y)
 {
     m_userScaleX = x;
     m_userScaleY = y;
 }
 
 void wxDC::SetUserScale(double x, double y)
 {
     m_userScaleX = x;
     m_userScaleY = y;

-    
+

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


@@ -1007,147 +1019,102 @@ 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);
 }
 
 void wxDC::SetSystemScale(double x, double y)
 {
     SetMapMode(m_mappingMode);
 }
 
 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);
-}
-
-long wxDC::DeviceToLogicalX(long x) const
-{
-    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_signX*m_systemScaleX)) ;
-}
-
-long wxDC::DeviceToLogicalY(long y) const
-{
-    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_signY*m_systemScaleY)) ;
-}

 
 

-long wxDC::LogicalToDeviceX(long x) const
-{
-    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_signX*m_systemScaleX) ;
+    ::SetViewportOrgEx(GetHdc(), (int)m_deviceOriginX, (int)m_deviceOriginY, NULL);

 }
 
 }
 

-long wxDC::LogicalToDeviceY(long y) const
-{
-    return (long) (floor((y) - m_logicalOriginY)*m_logicalScaleY*m_userScaleY*m_signY*m_systemScaleY + m_deviceOriginY);
-}
+// ---------------------------------------------------------------------------
+// coordinates transformations
+// ---------------------------------------------------------------------------

 
 

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

 {
 {

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

 }
 
 }
 

-// 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::DeviceToLogicalXRel(wxCoord x) const

 {
 {

-    //  return (m_scaleGDI ?  x :  DeviceToLogicalX(x));
-    return x;
+    return (wxCoord) ((x)/(m_logicalScaleX*m_userScaleX*m_signX*m_scaleX));

 }
 
 }
 

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

 {
 {

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

 }
 
 }
 

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

 {
 {

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

 }
 
 }
 

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

 {
 {

-    //  return (m_scaleGDI ?  y :  DeviceToLogicalYRel(y));
-    return y;
+    return (wxCoord) ((x - m_logicalOriginX)*m_logicalScaleX*m_userScaleX*m_signX*m_scaleX + m_deviceOriginX);

 }
 
 }
 

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

 {
 {

-    //  return (m_scaleGDI ?  (floor(double(x))) :  LogicalToDeviceX(x));
-    return x;
+    return (wxCoord) (x*m_logicalScaleX*m_userScaleX*m_signX*m_scaleX);

 }
 
 }
 

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

 {
 {

-    //  return (m_scaleGDI ?  (floor(double(y))) :  LogicalToDeviceY(y));
-    return y;
+    return (wxCoord) ((y - m_logicalOriginY)*m_logicalScaleY*m_userScaleY*m_signY*m_scaleY + m_deviceOriginY);

 }
 
 }
 

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

 {
 {

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

 }
 
 }
 

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

 {
 {

-    //  return (m_scaleGDI ?  (floor(double(y))) :  LogicalToDeviceYRel(y));
-    return y;
-}
+    wxCoord xdest1 = xdest;
+    wxCoord ydest1 = ydest;
+    wxCoord xsrc1 = xsrc;
+    wxCoord ysrc1 = ysrc;

 
 

-bool wxDC::Blit(long xdest, long ydest, long width, long height,
-                wxDC *source, long xsrc, long ysrc, int rop, bool useMask)
-{
-    long xdest1 = xdest;
-    long ydest1 = ydest;
-    long xsrc1 = xsrc;
-    long ysrc1 = ysrc;
-    

     // Chris Breeze 18/5/98: use text foreground/background colours
     // when blitting from 1-bit bitmaps
     // Chris Breeze 18/5/98: use text foreground/background colours
     // when blitting from 1-bit bitmaps

-    COLORREF old_textground = ::GetTextColor((HDC)m_hDC);
-    COLORREF old_background = ::GetBkColor((HDC)m_hDC);
+    COLORREF old_textground = ::GetTextColor(GetHdc());
+    COLORREF old_background = ::GetBkColor(GetHdc());

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

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

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

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

     }
     }

-    
+

     DWORD dwRop = rop == wxCOPY ? SRCCOPY :
     rop == wxCLEAR ? WHITENESS :
     rop == wxSET ? BLACKNESS :
     DWORD dwRop = rop == wxCOPY ? SRCCOPY :
     rop == wxCLEAR ? WHITENESS :
     rop == wxSET ? BLACKNESS :


@@ -1161,14 +1128,14 @@ bool wxDC::Blit(long xdest, long ydest, long width, long height,
     rop == wxSRC_OR ? SRCPAINT :
     rop == wxSRC_AND ? SRCAND :
     SRCCOPY;
     rop == wxSRC_OR ? SRCPAINT :
     rop == wxSRC_AND ? SRCAND :
     SRCCOPY;

-    
+

     bool success = TRUE;
     if (useMask && source->m_selectedBitmap.Ok() && source->m_selectedBitmap.GetMask())
     {
     bool success = TRUE;
     if (useMask && source->m_selectedBitmap.Ok() && source->m_selectedBitmap.GetMask())
     {

-        
+

 #if 0 // __WIN32__
         // Not implemented under Win95 (or maybe a specific device?)
 #if 0 // __WIN32__
         // Not implemented under Win95 (or maybe a specific device?)

-        if (MaskBlt((HDC) m_hDC, xdest1, ydest1, (int)width, (int)height,
+        if (MaskBlt(GetHdc(), xdest1, ydest1, (int)width, (int)height,

             (HDC) source->m_hDC, xsrc1, ysrc1, (HBITMAP) source->m_selectedBitmap.GetMask()->GetMaskBitmap(),
             0, 0, 0xAACC0020))
         {
             (HDC) source->m_hDC, xsrc1, ysrc1, (HBITMAP) source->m_selectedBitmap.GetMask()->GetMaskBitmap(),
             0, 0, 0xAACC0020))
         {


@@ -1181,16 +1148,16 @@ bool wxDC::Blit(long xdest, long ydest, long width, long height,
 #if 0
             HDC dc_mask = CreateCompatibleDC((HDC) source->m_hDC);
             ::SelectObject(dc_mask, (HBITMAP) source->m_selectedBitmap.GetMask()->GetMaskBitmap());
 #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,
+            success = (BitBlt(GetHdc(), xdest1, ydest1, (int)width, (int)height,

                 dc_mask, xsrc1, ysrc1, 0x00220326 /* NOTSRCAND */) != 0);
                 dc_mask, xsrc1, ysrc1, 0x00220326 /* NOTSRCAND */) != 0);

-            success = (BitBlt((HDC) m_hDC, xdest1, ydest1, (int)width, (int)height,
+            success = (BitBlt(GetHdc(), xdest1, ydest1, (int)width, (int)height,

                 (HDC) source->m_hDC, xsrc1, ysrc1, SRCPAINT) != 0);
             ::SelectObject(dc_mask, 0);
             ::DeleteDC(dc_mask);
 #endif
             // New code from Chris Breeze, 15/7/98
             // Blit bitmap with mask
                 (HDC) source->m_hDC, xsrc1, ysrc1, SRCPAINT) != 0);
             ::SelectObject(dc_mask, 0);
             ::DeleteDC(dc_mask);
 #endif
             // New code from Chris Breeze, 15/7/98
             // Blit bitmap with mask

-            
+

             if (IsKindOf(CLASSINFO(wxPrinterDC)))
             {
                 // If we are printing source colours are screen colours
             if (IsKindOf(CLASSINFO(wxPrinterDC)))
             {
                 // If we are printing source colours are screen colours


@@ -1199,7 +1166,7 @@ bool wxDC::Blit(long xdest, long ydest, long width, long height,
                 RECT rect;
                 HDC dc_mask = ::CreateCompatibleDC((HDC) source->m_hDC);
                 HDC dc_src = (HDC) source->m_hDC;
                 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++)
                 {
                 ::SelectObject(dc_mask, (HBITMAP) source->m_selectedBitmap.GetMask()->GetMaskBitmap());
                 for (int x = 0; x < width; x++)
                 {


@@ -1211,7 +1178,7 @@ bool wxDC::Blit(long xdest, long ydest, long width, long height,
                             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;
                             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);
+                            ::FillRect(GetHdc(), &rect, brush);

                             ::DeleteObject(brush);
                         }
                     }
                             ::DeleteObject(brush);
                         }
                     }


@@ -1223,37 +1190,37 @@ bool wxDC::Blit(long xdest, long ydest, long width, long height,
             {
                 // create a temp buffer bitmap and DCs to access it and the mask
                 HDC dc_mask = ::CreateCompatibleDC((HDC) source->m_hDC);
             {
                 // 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);
+                HDC dc_buffer = ::CreateCompatibleDC(GetHdc());
+                HBITMAP buffer_bmap = ::CreateCompatibleBitmap(GetHdc(), width, height);

                 ::SelectObject(dc_mask, (HBITMAP) source->m_selectedBitmap.GetMask()->GetMaskBitmap());
                 ::SelectObject(dc_buffer, buffer_bmap);
                 ::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,
                 // copy dest to buffer
                 ::BitBlt(dc_buffer, 0, 0, (int)width, (int)height,

-                    (HDC) m_hDC, xdest1, ydest1, SRCCOPY);
-                
+                    GetHdc(), 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);
                 // 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)
                 // 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));
+                COLORREF prevBkCol = ::SetBkColor(GetHdc(), RGB(255, 255, 255));
+                COLORREF prevCol = ::SetTextColor(GetHdc(), RGB(0, 0, 0));

                 ::BitBlt(dc_buffer, 0, 0, (int)width, (int)height,
                     dc_mask, xsrc1, ysrc1, SRCAND);
                 ::BitBlt(dc_buffer, 0, 0, (int)width, (int)height,
                     dc_mask, xsrc1, ysrc1, SRCAND);

-                
+

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

-                ::SetBkColor((HDC) m_hDC, RGB(0, 0, 0));
-                ::SetTextColor((HDC) m_hDC, RGB(255, 255, 255));
-                ::BitBlt((HDC) m_hDC, xdest1, ydest1, (int)width, (int)height,
+                ::SetBkColor(GetHdc(), RGB(0, 0, 0));
+                ::SetTextColor(GetHdc(), RGB(255, 255, 255));
+                ::BitBlt(GetHdc(), xdest1, ydest1, (int)width, (int)height,

                     dc_mask, xsrc1, ysrc1, SRCAND);
                     dc_mask, xsrc1, ysrc1, SRCAND);

-                ::SetBkColor((HDC) m_hDC, prevBkCol);   // restore colours to original values
-                ::SetTextColor((HDC) m_hDC, prevCol);
-                
+                ::SetBkColor(GetHdc(), prevBkCol);   // restore colours to original values
+                ::SetTextColor(GetHdc(), prevCol);
+

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

-                success = (::BitBlt((HDC) m_hDC, xdest1, ydest1, (int)width, (int)height,
+                success = (::BitBlt(GetHdc(), xdest1, ydest1, (int)width, (int)height,

                     dc_buffer, 0, 0, SRCPAINT) != 0);
                     dc_buffer, 0, 0, SRCPAINT) != 0);

-                
+

                 // tidy up temporary DCs and bitmap
                 ::SelectObject(dc_mask, 0);
                 ::DeleteDC(dc_mask);
                 // tidy up temporary DCs and bitmap
                 ::SelectObject(dc_mask, 0);
                 ::DeleteDC(dc_mask);


@@ -1279,85 +1246,41 @@ bool wxDC::Blit(long xdest, long ydest, long width, long height,
                     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;
                     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);
+                    ::FillRect(GetHdc(), &rect, brush);

                     ::DeleteObject(brush);
                 }
             }
         }
         else
         {
                     ::DeleteObject(brush);
                 }
             }
         }
         else
         {

-            success = (BitBlt((HDC) m_hDC, xdest1, ydest1, (int)width, (int)height, (HDC) source->m_hDC,
+            success = (BitBlt(GetHdc(), xdest1, ydest1, (int)width, (int)height, (HDC) source->m_hDC,

                 xsrc1, ysrc1, dwRop) != 0);
         }
     }
                 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;
-}
+    ::SetTextColor(GetHdc(), old_textground);
+    ::SetBkColor(GetHdc(), old_background);

 
 

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

 }
 
 }
 

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

 {
 {

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

 }
 
 }
 

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

 {
 {

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

 }
 
 }
 

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

 {
 {

-    m_textForegroundColour = colour;
-}
+    int x = ::GetDeviceCaps(GetHdc(), LOGPIXELSX);
+    int y = ::GetDeviceCaps(GetHdc(), LOGPIXELSY);

 
 

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

 }
 
 // For use by wxWindows only, unless custom units are required.
 }
 
 // For use by wxWindows only, unless custom units are required.


@@ -1367,33 +1290,12 @@ void wxDC::SetLogicalScale(double x, double y)
     m_logicalScaleY = y;
 }
 
     m_logicalScaleY = y;
 }
 

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

 #if WXWIN_COMPATIBILITY
 #if WXWIN_COMPATIBILITY

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

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

-    long x1, y1, descent1, externalLeading1;
+    wxCoord x1, y1, descent1, externalLeading1;

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


@@ -1403,69 +1305,30 @@ void wxDC::GetTextExtent(const wxString& string, float *x, float *y,
 }
 #endif
 
 }
 #endif
 

-int wxDC::GetDepth(void) const
-{
-    return (int) ::GetDeviceCaps((HDC) m_hDC,BITSPIXEL);
-}
+// ---------------------------------------------------------------------------
+// spline drawing code
+// ---------------------------------------------------------------------------

 
 #if wxUSE_SPLINES
 
 
 #if wxUSE_SPLINES
 

-// Make a 3-point spline
-void wxDC::DrawSpline(long x1, long y1, long x2, long y2, long x3, long y3)
-{
-    wxList *point_list = new wxList;
-    
-    wxPoint *point1 = new wxPoint;
-    point1->x = x1; point1->y = y1;
-    point_list->Append((wxObject*)point1);
-    
-    wxPoint *point2 = new wxPoint;
-    point2->x = x2; point2->y = y2;
-    point_list->Append((wxObject*)point2);
-    
-    wxPoint *point3 = new wxPoint;
-    point3->x = x3; point3->y = y3;
-    point_list->Append((wxObject*)point3);
-    
-    DrawSpline(point_list);
-    
-    for(wxNode *node = point_list->First(); node; node = node->Next()) {
-        wxPoint *p = (wxPoint *)node->Data();
-        delete p;
-    }
-    delete point_list;
-}
-
-////#define     wx_round(a)    (int)((a)+.5)
-//#define     wx_round(a)    (a)
-

 class wxSpline: public wxObject
 {
 public:
     int type;
     wxList *points;
 class wxSpline: public wxObject
 {
 public:
     int type;
     wxList *points;

-    
+

     wxSpline(wxList *list);
     wxSpline(wxList *list);

-    void DeletePoints(void);
-    
+    void DeletePoints();
+

     // Doesn't delete points
     // Doesn't delete points

-    ~wxSpline(void);
+    ~wxSpline();

 };
 
 };
 

-void wxDC::DrawSpline(int n, wxPoint points[])
-{
-    wxList list;
-    int i;
-    for (i =0; i < n; i++)
-        list.Append((wxObject*)&points[i]);
-    DrawSpline((wxList *)&list);
-}
-

 void wx_draw_open_spline(wxDC *dc, wxSpline *spline);
 
 void wx_quadratic_spline(double a1, double b1, double a2, double b2,
                          double a3, double b3, double a4, double b4);
 void wx_draw_open_spline(wxDC *dc, wxSpline *spline);
 
 void wx_quadratic_spline(double a1, double b1, double a2, double b2,
                          double a3, double b3, double a4, double b4);

-void wx_clear_stack(void);
+void wx_clear_stack();

 int wx_spline_pop(double *x1, double *y1, double *x2, double *y2, double *x3,
                   double *y3, double *x4, double *y4);
 void wx_spline_push(double x1, double y1, double x2, double y2, double x3, double y3,
 int wx_spline_pop(double *x1, double *y1, double *x2, double *y2, double *x3,
                   double *y3, double *x4, double *y4);
 void wx_spline_push(double x1, double y1, double x2, double y2, double x3, double y3,


@@ -1474,14 +1337,13 @@ static bool wx_spline_add_point(double x, double y);
 static void wx_spline_draw_point_array(wxDC *dc);
 wxSpline *wx_make_spline(int x1, int y1, int x2, int y2, int x3, int y3);
 
 static void wx_spline_draw_point_array(wxDC *dc);
 wxSpline *wx_make_spline(int x1, int y1, int x2, int y2, int x3, int y3);
 

-void wxDC::DrawSpline(wxList *list)
+void wxDC::DoDrawSpline(wxList *list)

 {
     wxSpline spline(list);
 {
     wxSpline spline(list);

-    
+

     wx_draw_open_spline(this, &spline);
 }
 
     wx_draw_open_spline(this, &spline);
 }
 

-

 wxList wx_spline_point_list;
 
 void wx_draw_open_spline(wxDC *dc, wxSpline *spline)
 wxList wx_spline_point_list;
 
 void wx_draw_open_spline(wxDC *dc, wxSpline *spline)


@@ -1489,25 +1351,25 @@ void wx_draw_open_spline(wxDC *dc, wxSpline *spline)
     wxPoint *p;
     double           cx1, cy1, cx2, cy2, cx3, cy3, cx4, cy4;
     double           x1, y1, x2, y2;
     wxPoint *p;
     double           cx1, cy1, cx2, cy2, cx3, cy3, cx4, cy4;
     double           x1, y1, x2, y2;

-    
+

     wxNode *node = spline->points->First();
     p = (wxPoint *)node->Data();
     wxNode *node = spline->points->First();
     p = (wxPoint *)node->Data();

-    
+

     x1 = p->x;
     y1 = p->y;
     x1 = p->x;
     y1 = p->y;

-    
+

     node = node->Next();
     p = (wxPoint *)node->Data();
     node = node->Next();
     p = (wxPoint *)node->Data();

-    
+

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

-    
+

     wx_spline_add_point(x1, y1);
     wx_spline_add_point(x1, y1);

-    
+

     while ((node = node->Next()) != NULL)
     {
         p = (wxPoint *)node->Data();
     while ((node = node->Next()) != NULL)
     {
         p = (wxPoint *)node->Data();


@@ -1519,37 +1381,37 @@ void wx_draw_open_spline(wxDC *dc, wxSpline *spline)
         cy4 = (double)(y1 + y2) / 2;
         cx3 = (double)(x1 + cx4) / 2;
         cy3 = (double)(y1 + cy4) / 2;
         cy4 = (double)(y1 + y2) / 2;
         cx3 = (double)(x1 + cx4) / 2;
         cy3 = (double)(y1 + cy4) / 2;

-        
+

         wx_quadratic_spline(cx1, cy1, cx2, cy2, cx3, cy3, cx4, cy4);
         wx_quadratic_spline(cx1, cy1, cx2, cy2, cx3, cy3, cx4, cy4);

-        
+

         cx1 = cx4;
         cy1 = cy4;
         cx2 = (double)(cx1 + x2) / 2;
         cy2 = (double)(cy1 + y2) / 2;
     }
         cx1 = cx4;
         cy1 = cy4;
         cx2 = (double)(cx1 + x2) / 2;
         cy2 = (double)(cy1 + y2) / 2;
     }

-    
+

     wx_spline_add_point((double)wx_round(cx1), (double)wx_round(cy1));
     wx_spline_add_point(x2, y2);
     wx_spline_add_point((double)wx_round(cx1), (double)wx_round(cy1));
     wx_spline_add_point(x2, y2);

-    
+

     wx_spline_draw_point_array(dc);
     wx_spline_draw_point_array(dc);

-    
+

 }
 
 /********************* CURVES FOR SPLINES *****************************
 
   The following spline drawing routine is from
 }
 
 /********************* CURVES FOR SPLINES *****************************
 
   The following spline drawing routine is from

-  
+

     "An Algorithm for High-Speed Curve Generation"
     by George Merrill Chaikin,
     Computer Graphics and Image Processing, 3, Academic Press,
     1974, 346-349.
     "An Algorithm for High-Speed Curve Generation"
     by George Merrill Chaikin,
     Computer Graphics and Image Processing, 3, Academic Press,
     1974, 346-349.

-    
+

       and
       and

-      
+

         "On Chaikin's Algorithm" by R. F. Riesenfeld,
         Computer Graphics and Image Processing, 4, Academic Press,
         1975, 304-310.
         "On Chaikin's Algorithm" by R. F. Riesenfeld,
         Computer Graphics and Image Processing, 4, Academic Press,
         1975, 304-310.

-        
+

 ***********************************************************************/
 
 #define     half(z1, z2)    ((z1+z2)/2.0)
 ***********************************************************************/
 
 #define     half(z1, z2)    ((z1+z2)/2.0)


@@ -1562,10 +1424,10 @@ void wx_quadratic_spline(double a1, double b1, double a2, double b2, double a3,
 {
     register double  xmid, ymid;
     double           x1, y1, x2, y2, x3, y3, x4, y4;
 {
     register double  xmid, ymid;
     double           x1, y1, x2, y2, x3, y3, x4, y4;

-    
+

     wx_clear_stack();
     wx_spline_push(a1, b1, a2, b2, a3, b3, a4, b4);
     wx_clear_stack();
     wx_spline_push(a1, b1, a2, b2, a3, b3, a4, b4);

-    
+

     while (wx_spline_pop(&x1, &y1, &x2, &y2, &x3, &y3, &x4, &y4)) {
         xmid = (double)half(x2, x3);
         ymid = (double)half(y2, y3);
     while (wx_spline_pop(&x1, &y1, &x2, &y2, &x3, &y3, &x4, &y4)) {
         xmid = (double)half(x2, x3);
         ymid = (double)half(y2, y3);


@@ -1596,7 +1458,7 @@ static Stack    wx_spline_stack[SPLINE_STACK_DEPTH];
 static Stack   *wx_stack_top;
 static int      wx_stack_count;
 
 static Stack   *wx_stack_top;
 static int      wx_stack_count;
 

-void wx_clear_stack(void)
+void wx_clear_stack()

 {
     wx_stack_top = wx_spline_stack;
     wx_stack_count = 0;
 {
     wx_stack_top = wx_spline_stack;
     wx_stack_count = 0;


@@ -1636,7 +1498,7 @@ int wx_spline_pop(double *x1, double *y1, double *x2, double *y2,
 
 static bool wx_spline_add_point(double x, double y)
 {
 
 static bool wx_spline_add_point(double x, double y)
 {

-    wxPoint *point = new wxPoint ;
+    wxPoint *point = new wxPoint;

     point->x = (int) x;
     point->y = (int) y;
     wx_spline_point_list.Append((wxObject*)point);
     point->x = (int) x;
     point->y = (int) y;
     wx_spline_point_list.Append((wxObject*)point);


@@ -1661,11 +1523,11 @@ wxSpline::wxSpline(wxList *list)
     points = list;
 }
 
     points = list;
 }
 

-wxSpline::~wxSpline(void)
+wxSpline::~wxSpline()

 {
 }
 
 {
 }
 

-void wxSpline::DeletePoints(void)
+void wxSpline::DeletePoints()

 {
     for(wxNode *node = points->First(); node; node = points->First())
     {
 {
     for(wxNode *node = points->First(); node; node = points->First())
     {