remove unused wxAppTraits-related files

[wxWidgets.git] / include / wx / dc.h

diff --git a/include/wx/dc.h b/include/wx/dc.h
index 34ce1abdc255cd30493ed35aa32b7767230411b8..f0fe623aa7da8ca63fc75bb2a5068e4b6d4d1c37 100644 (file)
--- a/include/wx/dc.h
+++ b/include/wx/dc.h
@@ -1,7 +1,7 @@
 /////////////////////////////////////////////////////////////////////////////
 // Name:        wx/dc.h
 // Purpose:     wxDC class
 /////////////////////////////////////////////////////////////////////////////
 // Name:        wx/dc.h
 // Purpose:     wxDC class

-// Author:      Vadim Zeitlin
+// Author:      Vadim Zeitlin 

 // Modified by:
 // Created:     05/25/99
 // RCS-ID:      $Id$
 // Modified by:
 // Created:     05/25/99
 // RCS-ID:      $Id$


@@ -26,14 +26,27 @@
 #include "wx/brush.h"
 #include "wx/pen.h"
 #include "wx/palette.h"
 #include "wx/brush.h"
 #include "wx/pen.h"
 #include "wx/palette.h"

-#include "wx/list.h"            // we use wxList in inline functions

 #include "wx/dynarray.h"
 #include "wx/math.h"
 #include "wx/dynarray.h"
 #include "wx/math.h"

+#include "wx/image.h"
+#include "wx/cmndata.h"

 
 

-class WXDLLEXPORT wxDC;
-class WXDLLEXPORT wxDCBase;
+#define wxUSE_NEW_DC 1

 
 

-class WXDLLEXPORT wxDrawObject
+class WXDLLIMPEXP_FWD_CORE wxDC;
+class WXDLLIMPEXP_FWD_CORE wxClientDC;
+class WXDLLIMPEXP_FWD_CORE wxPaintDC;
+class WXDLLIMPEXP_FWD_CORE wxWindowDC;
+class WXDLLIMPEXP_FWD_CORE wxScreenDC;
+class WXDLLIMPEXP_FWD_CORE wxMemoryDC;
+class WXDLLIMPEXP_FWD_CORE wxPrinterDC;
+class WXDLLIMPEXP_FWD_CORE wxPrintData;
+
+//-----------------------------------------------------------------------------
+// wxDrawObject helper class
+//-----------------------------------------------------------------------------
+
+class WXDLLIMPEXP_CORE wxDrawObject

 {
 public:
 
 {
 public:
 


@@ -44,7 +57,7 @@ public:
 
     virtual ~wxDrawObject() { }
 
 
     virtual ~wxDrawObject() { }
 

-    virtual void Draw(wxDCBase&) const { }
+    virtual void Draw(wxDC&) const { }

 
     virtual void CalcBoundingBox(wxCoord x, wxCoord y)
     {
 
     virtual void CalcBoundingBox(wxCoord x, wxCoord y)
     {


@@ -90,241 +103,403 @@ protected:
     wxCoord m_minX, m_minY, m_maxX, m_maxY;
 };
 
     wxCoord m_minX, m_minY, m_maxX, m_maxY;
 };
 

-// ---------------------------------------------------------------------------
-// global variables
-// ---------------------------------------------------------------------------

 
 

-// ---------------------------------------------------------------------------
-// wxDC is the device context - object on which any drawing is done
-// ---------------------------------------------------------------------------
+//-----------------------------------------------------------------------------
+// wxDCFactory
+//-----------------------------------------------------------------------------

 
 

-class WXDLLEXPORT wxDCBase : public wxObject
+class WXDLLIMPEXP_FWD_CORE wxDCImpl;
+
+class WXDLLIMPEXP_CORE wxDCFactory

 {
 public:
 {
 public:

-    wxDCBase()
-        : m_colour(wxColourDisplay())
-        , m_ok(true)
-        , m_clipping(false)
-        , m_isInteractive(0)
-        , m_isBBoxValid(false)
-        , 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_scaleX(1.0), m_scaleY(1.0)
-        , m_signX(1), m_signY(1)
-        , m_minX(0), m_minY(0), m_maxX(0), m_maxY(0)
-        , m_clipX1(0), m_clipY1(0), m_clipX2(0), m_clipY2(0)
-        , m_logicalFunction(wxCOPY)
-        , m_backgroundMode(wxTRANSPARENT)
-        , m_mappingMode(wxMM_TEXT)
-        , m_pen()
-        , m_brush()
-        , m_backgroundBrush(*wxTRANSPARENT_BRUSH)
-        , m_textForegroundColour(*wxBLACK)
-        , m_textBackgroundColour(*wxWHITE)
-        , m_font()
-#if wxUSE_PALETTE
-        , m_palette()
-        , m_hasCustomPalette(false)
-#endif // wxUSE_PALETTE
+    wxDCFactory() {}
+    virtual ~wxDCFactory() {}
+
+    virtual wxDCImpl* CreateWindowDC( wxWindowDC *owner ) = 0;
+    virtual wxDCImpl* CreateWindowDC( wxWindowDC *owner, wxWindow *window ) = 0;
+    virtual wxDCImpl* CreateClientDC( wxClientDC *owner ) = 0;
+    virtual wxDCImpl* CreateClientDC( wxClientDC *owner, wxWindow *window ) = 0;
+    virtual wxDCImpl* CreatePaintDC( wxPaintDC *owner ) = 0;
+    virtual wxDCImpl* CreatePaintDC( wxPaintDC *owner, wxWindow *window ) = 0;
+    virtual wxDCImpl* CreateMemoryDC( wxMemoryDC *owner ) = 0;
+    virtual wxDCImpl* CreateMemoryDC( wxMemoryDC *owner, wxBitmap &bitmap ) = 0;
+    virtual wxDCImpl* CreateMemoryDC( wxMemoryDC *owner, wxDC *dc ) = 0;
+    virtual wxDCImpl* CreateScreenDC( wxScreenDC *owner ) = 0;
+#if wxUSE_PRINTING_ARCHITECTURE
+    virtual wxDCImpl* CreatePrinterDC( wxPrinterDC *owner, const wxPrintData &data  ) = 0;
+#endif
+
+    static void Set(wxDCFactory *factory);
+    static wxDCFactory *Get();
+
+private:
+    static wxDCFactory *m_factory;
+};
+
+//-----------------------------------------------------------------------------
+// wxNativeDCFactory
+//-----------------------------------------------------------------------------
+
+class WXDLLIMPEXP_CORE wxNativeDCFactory: public wxDCFactory
+{
+public:
+    wxNativeDCFactory() {}
+
+    virtual wxDCImpl* CreateWindowDC( wxWindowDC *owner );
+    virtual wxDCImpl* CreateWindowDC( wxWindowDC *owner, wxWindow *window );
+    virtual wxDCImpl* CreateClientDC( wxClientDC *owner );
+    virtual wxDCImpl* CreateClientDC( wxClientDC *owner, wxWindow *window );
+    virtual wxDCImpl* CreatePaintDC( wxPaintDC *owner );
+    virtual wxDCImpl* CreatePaintDC( wxPaintDC *owner, wxWindow *window );
+    virtual wxDCImpl* CreateMemoryDC( wxMemoryDC *owner );
+    virtual wxDCImpl* CreateMemoryDC( wxMemoryDC *owner, wxBitmap &bitmap );
+    virtual wxDCImpl* CreateMemoryDC( wxMemoryDC *owner, wxDC *dc );
+    virtual wxDCImpl* CreateScreenDC( wxScreenDC *owner );
+#if wxUSE_PRINTING_ARCHITECTURE
+    virtual wxDCImpl* CreatePrinterDC( wxPrinterDC *owner, const wxPrintData &data  );
+#endif
+};
+
+//-----------------------------------------------------------------------------
+// wxDCImpl
+//-----------------------------------------------------------------------------
+
+class WXDLLIMPEXP_CORE wxDCImpl: public wxObject
+{
+public:
+    wxDCImpl( wxDC *owner );
+    ~wxDCImpl();
+
+    wxDC *GetOwner() const { return m_owner; }
+
+    wxWindow* GetWindow() const { return m_window; }
+
+    virtual bool IsOk() const { return m_ok; }
+
+    // query capabilities
+
+    virtual bool CanDrawBitmap() const = 0;
+    virtual bool CanGetTextExtent() const = 0;
+
+    // query dimension, colour deps, resolution
+
+    virtual void DoGetSize(int *width, int *height) const = 0;
+    void GetSize(int *width, int *height) const
+    {
+        DoGetSize(width, height);
+        return ;
+    }
+
+    wxSize GetSize() const

     {
     {

-        ResetBoundingBox();
-        ResetClipping();
+        int w, h;
+        DoGetSize(&w, &h);
+        return wxSize(w, h);

     }
 
     }
 

-    virtual ~wxDCBase() { }
+    virtual void DoGetSizeMM(int* width, int* height) const = 0;
+
+    virtual int GetDepth() const = 0;
+    virtual wxSize GetPPI() const = 0;

 
 

-    // graphic primitives
-    // ------------------
+    // Right-To-Left (RTL) modes

 
 

-    virtual void DrawObject(wxDrawObject* drawobject)
+    virtual void SetLayoutDirection(wxLayoutDirection WXUNUSED(dir)) { }
+    virtual wxLayoutDirection GetLayoutDirection() const  { return wxLayout_Default; }
+
+    // page and document
+
+    virtual bool StartDoc(const wxString& WXUNUSED(message)) { return true; }
+    virtual void EndDoc() { }
+
+    virtual void StartPage() { }
+    virtual void EndPage() { }
+
+    // flushing the content of this dc immediately eg onto screen
+    virtual void Flush() { }
+
+    // bounding box
+
+    virtual void CalcBoundingBox(wxCoord x, wxCoord y)

     {
     {

-        drawobject->Draw(*this);
-        CalcBoundingBox(drawobject->MinX(),drawobject->MinY());
-        CalcBoundingBox(drawobject->MaxX(),drawobject->MaxY());
+      if ( m_isBBoxValid )
+      {
+         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;
+      }
+      else
+      {
+         m_isBBoxValid = true;
+
+         m_minX = x;
+         m_minY = y;
+         m_maxX = x;
+         m_maxY = y;
+      }

     }
     }

+    void ResetBoundingBox()
+    {
+        m_isBBoxValid = false;

 
 

-    bool FloodFill(wxCoord x, wxCoord y, const wxColour& col,
-                   int style = wxFLOOD_SURFACE)
-        { return DoFloodFill(x, y, col, style); }
-    bool FloodFill(const wxPoint& pt, const wxColour& col,
-                   int style = wxFLOOD_SURFACE)
-        { return DoFloodFill(pt.x, pt.y, col, style); }
+        m_minX = m_maxX = m_minY = m_maxY = 0;
+    }

 
 

-    // fill the area specified by rect with a radial gradient, starting from
-    // initialColour in the centre of the cercle and fading to destColour.
-    void GradientFillConcentric(const wxRect& rect,
-                                const wxColour& initialColour,
-                                const wxColour& destColour)
-        { GradientFillConcentric(rect, initialColour, destColour,
-                                 wxPoint(rect.GetWidth() / 2,
-                                         rect.GetHeight() / 2)); }
+    wxCoord MinX() const { return m_minX; }
+    wxCoord MaxX() const { return m_maxX; }
+    wxCoord MinY() const { return m_minY; }
+    wxCoord MaxY() const { return m_maxY; }

 
 

-    void GradientFillConcentric(const wxRect& rect,
-                                const wxColour& initialColour,
-                                const wxColour& destColour,
-                                const wxPoint& circleCenter)
-        { DoGradientFillConcentric(rect, initialColour, destColour, circleCenter); }
+    // setters and getters

 
 

-    // fill the area specified by rect with a linear gradient
-    void GradientFillLinear(const wxRect& rect,
-                            const wxColour& initialColour,
-                            const wxColour& destColour,
-                            wxDirection nDirection = wxEAST)
-        { DoGradientFillLinear(rect, initialColour, destColour, nDirection); }
+    virtual void SetFont(const wxFont& font) = 0;
+    virtual const wxFont&   GetFont() const { return m_font; }

 
 

-    bool GetPixel(wxCoord x, wxCoord y, wxColour *col) const
-        { return DoGetPixel(x, y, col); }
-    bool GetPixel(const wxPoint& pt, wxColour *col) const
-        { return DoGetPixel(pt.x, pt.y, col); }
+    virtual void SetPen(const wxPen& pen) = 0;
+    virtual const wxPen&    GetPen() const { return m_pen; }

 
 

-    void DrawLine(wxCoord x1, wxCoord y1, wxCoord x2, wxCoord y2)
-        { DoDrawLine(x1, y1, x2, y2); }
-    void DrawLine(const wxPoint& pt1, const wxPoint& pt2)
-        { DoDrawLine(pt1.x, pt1.y, pt2.x, pt2.y); }
+    virtual void SetBrush(const wxBrush& brush) = 0;
+    virtual const wxBrush&  GetBrush() const { return m_brush; }

 
 

-    void CrossHair(wxCoord x, wxCoord y)
-        { DoCrossHair(x, y); }
-    void CrossHair(const wxPoint& pt)
-        { DoCrossHair(pt.x, pt.y); }
+    virtual void SetBackground(const wxBrush& brush) = 0;
+    virtual const wxBrush&  GetBackground() const { return m_backgroundBrush; }

 
 

-    void DrawArc(wxCoord x1, wxCoord y1, wxCoord x2, wxCoord y2,
-                 wxCoord xc, wxCoord yc)
-        { DoDrawArc(x1, y1, x2, y2, xc, yc); }
-    void DrawArc(const wxPoint& pt1, const wxPoint& pt2, const wxPoint& centre)
-        { DoDrawArc(pt1.x, pt1.y, pt2.x, pt2.y, centre.x, centre.y); }
+    virtual void SetBackgroundMode(int mode) = 0;
+    virtual int GetBackgroundMode() const { return m_backgroundMode; }

 
 

-    void DrawCheckMark(wxCoord x, wxCoord y,
-                       wxCoord width, wxCoord height)
-        { DoDrawCheckMark(x, y, width, height); }
-    void DrawCheckMark(const wxRect& rect)
-        { DoDrawCheckMark(rect.x, rect.y, rect.width, rect.height); }
+    virtual void SetTextForeground(const wxColour& colour)
+        { m_textForegroundColour = colour; }
+    virtual const wxColour& GetTextForeground() const { return m_textForegroundColour; }

 
 

-    void DrawEllipticArc(wxCoord x, wxCoord y, wxCoord w, wxCoord h,
-                         double sa, double ea)
-        { DoDrawEllipticArc(x, y, w, h, sa, ea); }
-    void DrawEllipticArc(const wxPoint& pt, const wxSize& sz,
-                         double sa, double ea)
-        { DoDrawEllipticArc(pt.x, pt.y, sz.x, sz.y, sa, ea); }
+    virtual void SetTextBackground(const wxColour& colour)
+        { m_textBackgroundColour = colour; }
+    virtual const wxColour& GetTextBackground() const { return m_textBackgroundColour; }

 
 

-    void DrawPoint(wxCoord x, wxCoord y)
-        { DoDrawPoint(x, y); }
-    void DrawPoint(const wxPoint& pt)
-        { DoDrawPoint(pt.x, pt.y); }
+#if wxUSE_PALETTE
+    virtual void SetPalette(const wxPalette& palette) = 0;
+#endif // wxUSE_PALETTE

 
 

-    void DrawLines(int n, wxPoint points[],
-                   wxCoord xoffset = 0, wxCoord yoffset = 0)
-        { DoDrawLines(n, points, xoffset, yoffset); }
-    void DrawLines(const wxList *list,
-                   wxCoord xoffset = 0, wxCoord yoffset = 0);
+    // logical functions

 
 

-    void DrawPolygon(int n, wxPoint points[],
-                     wxCoord xoffset = 0, wxCoord yoffset = 0,
-                     int fillStyle = wxODDEVEN_RULE)
-        { DoDrawPolygon(n, points, xoffset, yoffset, fillStyle); }
+    virtual void SetLogicalFunction(int function) = 0;
+    virtual int GetLogicalFunction() const { return m_logicalFunction; }

 
 

-    void DrawPolygon(const wxList *list,
-                     wxCoord xoffset = 0, wxCoord yoffset = 0,
-                     int fillStyle = wxODDEVEN_RULE);
+    // text measurement

 
 

-    void DrawPolyPolygon(int n, int count[], wxPoint points[],
-                         wxCoord xoffset = 0, wxCoord yoffset = 0,
-                         int fillStyle = wxODDEVEN_RULE)
-        { DoDrawPolyPolygon(n, count, points, xoffset, yoffset, fillStyle); }
+    virtual wxCoord GetCharHeight() const = 0;
+    virtual wxCoord GetCharWidth() const = 0;
+    virtual void DoGetTextExtent(const wxString& string,
+                                 wxCoord *x, wxCoord *y,
+                                 wxCoord *descent = NULL,
+                                 wxCoord *externalLeading = NULL,
+                                 const wxFont *theFont = NULL) const = 0;
+    virtual void GetMultiLineTextExtent(const wxString& string,
+                                        wxCoord *width,
+                                        wxCoord *height,
+                                        wxCoord *heightLine = NULL,
+                                        const wxFont *font = NULL) const;
+    virtual bool DoGetPartialTextExtents(const wxString& text, wxArrayInt& widths) const;

 
 

-    void DrawRectangle(wxCoord x, wxCoord y, wxCoord width, wxCoord height)
-        { DoDrawRectangle(x, y, width, height); }
-    void DrawRectangle(const wxPoint& pt, const wxSize& sz)
-        { DoDrawRectangle(pt.x, pt.y, sz.x, sz.y); }
-    void DrawRectangle(const wxRect& rect)
-        { DoDrawRectangle(rect.x, rect.y, rect.width, rect.height); }
+    // clearing

 
 

-    void DrawRoundedRectangle(wxCoord x, wxCoord y, wxCoord width, wxCoord height,
-                              double radius)
-        { DoDrawRoundedRectangle(x, y, width, height, radius); }
-    void DrawRoundedRectangle(const wxPoint& pt, const wxSize& sz,
-                             double radius)
-        { DoDrawRoundedRectangle(pt.x, pt.y, sz.x, sz.y, radius); }
-    void DrawRoundedRectangle(const wxRect& r, double radius)
-        { DoDrawRoundedRectangle(r.x, r.y, r.width, r.height, radius); }
+    virtual void Clear() = 0;

 
 

-    void DrawCircle(wxCoord x, wxCoord y, wxCoord radius)
-        { DoDrawEllipse(x - radius, y - radius, 2*radius, 2*radius); }
-    void DrawCircle(const wxPoint& pt, wxCoord radius)
-        { DrawCircle(pt.x, pt.y, radius); }
+    // clipping

 
 

-    void DrawEllipse(wxCoord x, wxCoord y, wxCoord width, wxCoord height)
-        { DoDrawEllipse(x, y, width, height); }
-    void DrawEllipse(const wxPoint& pt, const wxSize& sz)
-        { DoDrawEllipse(pt.x, pt.y, sz.x, sz.y); }
-    void DrawEllipse(const wxRect& rect)
-        { DoDrawEllipse(rect.x, rect.y, rect.width, rect.height); }
+    virtual void DoSetClippingRegion(wxCoord x, wxCoord y,
+                                     wxCoord width, wxCoord height) = 0;
+    virtual void DoSetClippingRegionAsRegion(const wxRegion& region) = 0;

 
 

-    void DrawIcon(const wxIcon& icon, wxCoord x, wxCoord y)
-        { DoDrawIcon(icon, x, y); }
-    void DrawIcon(const wxIcon& icon, const wxPoint& pt)
-        { DoDrawIcon(icon, pt.x, pt.y); }
+    virtual void DoGetClippingBox(wxCoord *x, wxCoord *y,
+                                  wxCoord *w, wxCoord *h) const
+    {
+        if ( x )
+            *x = m_clipX1;
+        if ( y )
+            *y = m_clipY1;
+        if ( w )
+            *w = m_clipX2 - m_clipX1;
+        if ( h )
+            *h = m_clipY2 - m_clipY1;
+    }

 
 

-    void DrawBitmap(const wxBitmap &bmp, wxCoord x, wxCoord y,
-                    bool useMask = false)
-        { DoDrawBitmap(bmp, x, y, useMask); }
-    void DrawBitmap(const wxBitmap &bmp, const wxPoint& pt,
-                    bool useMask = false)
-        { DoDrawBitmap(bmp, pt.x, pt.y, useMask); }
+    virtual void DestroyClippingRegion() { ResetClipping(); }

 
 

-    void DrawText(const wxString& text, wxCoord x, wxCoord y)
-        { DoDrawText(text, x, y); }
-    void DrawText(const wxString& text, const wxPoint& pt)
-        { DoDrawText(text, pt.x, pt.y); }

 
 

-    void DrawRotatedText(const wxString& text, wxCoord x, wxCoord y, double angle)
-        { DoDrawRotatedText(text, x, y, angle); }
-    void DrawRotatedText(const wxString& text, const wxPoint& pt, double angle)
-        { DoDrawRotatedText(text, pt.x, pt.y, angle); }
+    // coordinates conversions and transforms

 
 

-    // this version puts both optional bitmap and the text into the given
-    // rectangle and aligns is as specified by alignment parameter; it also
-    // will emphasize the character with the given index if it is != -1 and
-    // return the bounding rectangle if required
-    virtual void DrawLabel(const wxString& text,
-                           const wxBitmap& image,
-                           const wxRect& rect,
-                           int alignment = wxALIGN_LEFT | wxALIGN_TOP,
-                           int indexAccel = -1,
-                           wxRect *rectBounding = NULL);
+    virtual wxCoord DeviceToLogicalX(wxCoord x) const;
+    virtual wxCoord DeviceToLogicalY(wxCoord y) const;
+    virtual wxCoord DeviceToLogicalXRel(wxCoord x) const;
+    virtual wxCoord DeviceToLogicalYRel(wxCoord y) const;
+    virtual wxCoord LogicalToDeviceX(wxCoord x) const;
+    virtual wxCoord LogicalToDeviceY(wxCoord y) const;
+    virtual wxCoord LogicalToDeviceXRel(wxCoord x) const;
+    virtual wxCoord LogicalToDeviceYRel(wxCoord y) const;

 
 

-    void DrawLabel(const wxString& text, const wxRect& rect,
-                   int alignment = wxALIGN_LEFT | wxALIGN_TOP,
-                   int indexAccel = -1)
-        { DrawLabel(text, wxNullBitmap, rect, alignment, indexAccel); }
+    virtual void SetMapMode(int mode);
+    virtual int GetMapMode() const { return m_mappingMode; }

 
 

-    bool Blit(wxCoord xdest, wxCoord ydest, wxCoord width, wxCoord height,
-              wxDC *source, wxCoord xsrc, wxCoord ysrc,
-              int rop = wxCOPY, bool useMask = false, wxCoord xsrcMask = wxDefaultCoord, wxCoord ysrcMask = wxDefaultCoord)
+    virtual void SetUserScale(double x, double y);
+    virtual void GetUserScale(double *x, double *y) const

     {
     {

-        return DoBlit(xdest, ydest, width, height,
-                      source, xsrc, ysrc, rop, useMask, xsrcMask, ysrcMask);
+        if ( x ) *x = m_userScaleX;
+        if ( y ) *y = m_userScaleY;

     }
     }

-    bool Blit(const wxPoint& destPt, const wxSize& sz,
-              wxDC *source, const wxPoint& srcPt,
-              int rop = wxCOPY, bool useMask = false, const wxPoint& srcPtMask = wxDefaultPosition)
+
+    virtual void SetLogicalScale(double x, double y);
+    virtual void GetLogicalScale(double *x, double *y)

     {
     {

-        return DoBlit(destPt.x, destPt.y, sz.x, sz.y,
-                      source, srcPt.x, srcPt.y, rop, useMask, srcPtMask.x, srcPtMask.y);
+        if ( x ) *x = m_logicalScaleX;
+        if ( y ) *y = m_logicalScaleY;

     }
 
     }
 

+    virtual void SetLogicalOrigin(wxCoord x, wxCoord y);
+    virtual void DoGetLogicalOrigin(wxCoord *x, wxCoord *y) const
+    {
+        if ( x ) *x = m_logicalOriginX;
+        if ( y ) *y = m_logicalOriginY;
+    }
+
+    virtual void SetDeviceOrigin(wxCoord x, wxCoord y);
+    virtual void DoGetDeviceOrigin(wxCoord *x, wxCoord *y) const
+    {
+        if ( x ) *x = m_deviceOriginX;
+        if ( y ) *y = m_deviceOriginY;
+    }
+
+    virtual void SetDeviceLocalOrigin( wxCoord x, wxCoord y );
+
+    virtual void ComputeScaleAndOrigin();
+
+    // this needs to overidden if the axis is inverted
+    virtual void SetAxisOrientation(bool xLeftRight, bool yBottomUp);
+
+    // ---------------------------------------------------------
+    // the actual drawing API
+
+    virtual bool DoFloodFill(wxCoord x, wxCoord y, const wxColour& col,
+                             int style = wxFLOOD_SURFACE) = 0;
+
+    virtual void DoGradientFillLinear(const wxRect& rect,
+                                      const wxColour& initialColour,
+                                      const wxColour& destColour,
+                                      wxDirection nDirection = wxEAST);
+
+    virtual void DoGradientFillConcentric(const wxRect& rect,
+                                        const wxColour& initialColour,
+                                        const wxColour& destColour,
+                                        const wxPoint& circleCenter);
+
+    virtual bool DoGetPixel(wxCoord x, wxCoord y, wxColour *col) const = 0;
+
+    virtual void DoDrawPoint(wxCoord x, wxCoord y) = 0;
+    virtual void DoDrawLine(wxCoord x1, wxCoord y1, wxCoord x2, wxCoord y2) = 0;
+
+    virtual void DoDrawArc(wxCoord x1, wxCoord y1,
+                           wxCoord x2, wxCoord y2,
+                           wxCoord xc, wxCoord yc) = 0;
+    virtual void DoDrawCheckMark(wxCoord x, wxCoord y,
+                                 wxCoord width, wxCoord height);
+    virtual void DoDrawEllipticArc(wxCoord x, wxCoord y, wxCoord w, wxCoord h,
+                                   double sa, double ea) = 0;
+
+    virtual void DoDrawRectangle(wxCoord x, wxCoord y, wxCoord width, wxCoord height) = 0;
+    virtual void DoDrawRoundedRectangle(wxCoord x, wxCoord y,
+                                        wxCoord width, wxCoord height,
+                                        double radius) = 0;
+    virtual void DoDrawEllipse(wxCoord x, wxCoord y,
+                               wxCoord width, wxCoord height) = 0;
+
+    virtual void DoCrossHair(wxCoord x, wxCoord y) = 0;
+
+    virtual void DoDrawIcon(const wxIcon& icon, wxCoord x, wxCoord y) = 0;
+    virtual void DoDrawBitmap(const wxBitmap &bmp, wxCoord x, wxCoord y,
+                              bool useMask = false) = 0;
+
+    virtual void DoDrawText(const wxString& text, wxCoord x, wxCoord y) = 0;
+    virtual void DoDrawRotatedText(const wxString& text,
+                                   wxCoord x, wxCoord y, double angle) = 0;
+
+    virtual bool DoBlit(wxCoord xdest, wxCoord ydest,
+                        wxCoord width, wxCoord height,
+                        wxDC *source,
+                        wxCoord xsrc, wxCoord ysrc,
+                        int rop = wxCOPY,
+                        bool useMask = false,
+                        wxCoord xsrcMask = wxDefaultCoord,
+                        wxCoord ysrcMask = wxDefaultCoord) = 0;
+
+    virtual bool DoStretchBlit(wxCoord xdest, wxCoord ydest,
+                               wxCoord dstWidth, wxCoord dstHeight,
+                               wxDC *source,
+                               wxCoord xsrc, wxCoord ysrc,
+                               wxCoord srcWidth, wxCoord srcHeight,
+                               int rop = wxCOPY,
+                               bool useMask = false,
+                               wxCoord xsrcMask = wxDefaultCoord,
+                               wxCoord ysrcMask = wxDefaultCoord);
+
+    virtual wxBitmap DoGetAsBitmap(const wxRect *WXUNUSED(subrect)) const
+        { return wxNullBitmap; }
+
+
+    virtual void DoDrawLines(int n, wxPoint points[],
+                             wxCoord xoffset, wxCoord yoffset ) = 0;
+    virtual void DrawLines(const wxPointList *list,
+                           wxCoord xoffset, wxCoord yoffset );
+
+    virtual void DoDrawPolygon(int n, wxPoint points[],
+                               wxCoord xoffset, wxCoord yoffset,
+                               int fillStyle = wxODDEVEN_RULE) = 0;
+    virtual void DoDrawPolyPolygon(int n, int count[], wxPoint points[],
+                               wxCoord xoffset, wxCoord yoffset,
+                               int fillStyle);
+    void DrawPolygon(const wxPointList *list,
+                     wxCoord xoffset, wxCoord yoffset,
+                     int fillStyle );
+
+

 #if wxUSE_SPLINES
 #if wxUSE_SPLINES

-    // TODO: this API needs fixing (wxPointList, why (!const) "wxList *"?)
-    void DrawSpline(wxCoord x1, wxCoord y1,
-                    wxCoord x2, wxCoord y2,
-                    wxCoord x3, wxCoord y3);
-    void DrawSpline(int n, wxPoint points[]);
+    virtual void DoDrawSpline(wxCoord x1, wxCoord y1, wxCoord x2, wxCoord y2, wxCoord x3, wxCoord y3);
+    virtual void DoDrawSpline(int n, wxPoint points[]);
+    virtual void DoDrawSpline(const wxPointList *points);
+#endif

 
 

-    void DrawSpline(wxList *points) { DoDrawSpline(points); }
-#endif // wxUSE_SPLINES
+    // ---------------------------------------------------------
+    // wxMemoryDC Impl API
+
+    virtual void DoSelect(const wxBitmap& WXUNUSED(bmp))
+       { }
+
+    virtual const wxBitmap& GetSelectedBitmap() const
+        { return wxNullBitmap; }
+    virtual wxBitmap& GetSelectedBitmap()
+        { return wxNullBitmap; }
+
+    // ---------------------------------------------------------
+    // wxPrinterDC Impl API
+
+    virtual wxRect GetPaperRect()
+        { int w = 0; int h = 0; DoGetSize( &w, &h ); return wxRect(0,0,w,h); }
+
+    virtual int GetResolution()
+        { return -1; }
+
+private:
+    wxDC       *m_owner;
+
+protected:
+    // unset clipping variables (after clipping region was destroyed)
+    void ResetClipping()
+    {
+        m_clipping = false;
+
+        m_clipX1 = m_clipX2 = m_clipY1 = m_clipY2 = 0;
+    }

 
 

-    // Eventually we will have wxUSE_GENERIC_DRAWELLIPSE

 #ifdef __WXWINCE__
     //! Generic method to draw ellipses, circles and arcs with current pen and brush.
     /*! \param x Upper left corner of bounding box.
 #ifdef __WXWINCE__
     //! Generic method to draw ellipses, circles and arcs with current pen and brush.
     /*! \param x Upper left corner of bounding box.


@@ -362,510 +537,587 @@ public:
      *  \param angle Rotating angle (counterclockwise, start at 3 o'clock, 360 is full circle).
      *  \param center Center of rotation.
      */
      *  \param angle Rotating angle (counterclockwise, start at 3 o'clock, 360 is full circle).
      *  \param center Center of rotation.
      */

-    void Rotate( wxList* points, double angle, wxPoint center = wxPoint(0,0) );
+    void Rotate( wxPointList* points, double angle, wxPoint center = wxPoint(0,0) );

 
     // used by DrawEllipticArcRot
     // Careful: wxList gets filled with points you have to delete later.
 
     // used by DrawEllipticArcRot
     // Careful: wxList gets filled with points you have to delete later.

-    void CalculateEllipticPoints( wxList* points,
+    void CalculateEllipticPoints( wxPointList* points,

                                   wxCoord xStart, wxCoord yStart,
                                   wxCoord w, wxCoord h,
                                   double sa, double ea );
                                   wxCoord xStart, wxCoord yStart,
                                   wxCoord w, wxCoord h,
                                   double sa, double ea );

-#endif
+#endif // __WXWINCE__

 
 

-    // global DC operations
-    // --------------------

 
 

-    virtual void Clear() = 0;
+    // window on which the DC draws or NULL
+    wxWindow   *m_window;

 
 

-    virtual bool StartDoc(const wxString& WXUNUSED(message)) { return true; }
-    virtual void EndDoc() { }
+    // flags
+    bool m_colour:1;
+    bool m_ok:1;
+    bool m_clipping:1;
+    bool m_isInteractive:1;
+    bool m_isBBoxValid:1;

 
 

-    virtual void StartPage() { }
-    virtual void EndPage() { }
+    // coordinate system variables

 
 

-#if WXWIN_COMPATIBILITY_2_6
-    wxDEPRECATED( void BeginDrawing() );
-    wxDEPRECATED( void EndDrawing() );
-#endif // WXWIN_COMPATIBILITY_2_6
+    wxCoord m_logicalOriginX, m_logicalOriginY;
+    wxCoord m_deviceOriginX, m_deviceOriginY;           // Usually 0,0, can be change by user
+
+    wxCoord m_deviceLocalOriginX, m_deviceLocalOriginY; // non-zero if native top-left corner
+                                                        // is not at 0,0. This was the case under
+                                                        // Mac's GrafPorts (coordinate system
+                                                        // used toplevel window's origin) and
+                                                        // e.g. for Postscript, where the native
+                                                        // origin in the bottom left corner.
+    double m_logicalScaleX, m_logicalScaleY;
+    double m_userScaleX, m_userScaleY;
+    double m_scaleX, m_scaleY;  // calculated from logical scale and user scale

 
 

+    int m_signX, m_signY;  // Used by SetAxisOrientation() to invert the axes

 
 

-    // set objects to use for drawing
-    // ------------------------------
+    // what is a mm on a screen you don't know the size of?
+    double       m_mm_to_pix_x,
+                 m_mm_to_pix_y;

 
 

-    virtual void SetFont(const wxFont& font) = 0;
-    virtual void SetPen(const wxPen& pen) = 0;
-    virtual void SetBrush(const wxBrush& brush) = 0;
-    virtual void SetBackground(const wxBrush& brush) = 0;
-    virtual void SetBackgroundMode(int mode) = 0;
-#if wxUSE_PALETTE
-    virtual void SetPalette(const wxPalette& palette) = 0;
-#endif // wxUSE_PALETTE
+    // bounding and clipping boxes
+    wxCoord m_minX, m_minY, m_maxX, m_maxY;
+    wxCoord m_clipX1, m_clipY1, m_clipX2, m_clipY2;

 
 

-    // clipping region
-    // ---------------
+    int m_logicalFunction;
+    int m_backgroundMode;
+    int m_mappingMode;

 
 

-    void SetClippingRegion(wxCoord x, wxCoord y, wxCoord width, wxCoord height)
-        { DoSetClippingRegion(x, y, width, height); }
-    void SetClippingRegion(const wxPoint& pt, const wxSize& sz)
-        { DoSetClippingRegion(pt.x, pt.y, sz.x, sz.y); }
-    void SetClippingRegion(const wxRect& rect)
-        { DoSetClippingRegion(rect.x, rect.y, rect.width, rect.height); }
-    void SetClippingRegion(const wxRegion& region)
-        { DoSetClippingRegionAsRegion(region); }
+    wxPen             m_pen;
+    wxBrush           m_brush;
+    wxBrush           m_backgroundBrush;
+    wxColour          m_textForegroundColour;
+    wxColour          m_textBackgroundColour;
+    wxFont            m_font;

 
 

-    virtual void DestroyClippingRegion() { ResetClipping(); }
+#if wxUSE_PALETTE
+    wxPalette         m_palette;
+    bool              m_hasCustomPalette;
+#endif // wxUSE_PALETTE

 
 

-    void GetClippingBox(wxCoord *x, wxCoord *y, wxCoord *w, wxCoord *h) const
-        { DoGetClippingBox(x, y, w, h); }
-    void GetClippingBox(wxRect& rect) const
-        {
-          DoGetClippingBox(&rect.x, &rect.y, &rect.width, &rect.height);
-        }
+private:
+    DECLARE_ABSTRACT_CLASS(wxDCImpl)
+};

 
 

-    // text extent
-    // -----------

 
 

-    virtual wxCoord GetCharHeight() const = 0;
-    virtual wxCoord GetCharWidth() const = 0;
+class WXDLLIMPEXP_CORE wxDC : public wxObject
+{
+public:
+    virtual ~wxDC() { delete m_pimpl; }

 
 

-    // only works for single line strings
-    void GetTextExtent(const wxString& string,
-                       wxCoord *x, wxCoord *y,
-                       wxCoord *descent = NULL,
-                       wxCoord *externalLeading = NULL,
-                       wxFont *theFont = NULL) const
-        { DoGetTextExtent(string, x, y, descent, externalLeading, theFont); }
+    wxDCImpl *GetImpl()
+        { return m_pimpl; }
+    const wxDCImpl *GetImpl() const
+        { return m_pimpl; }

 
 

-    // works for single as well as multi-line strings
-    virtual void GetMultiLineTextExtent(const wxString& text,
-                                        wxCoord *width,
-                                        wxCoord *height,
-                                        wxCoord *heightLine = NULL,
-                                        wxFont *font = NULL);
+    wxWindow *GetWindow() const
+        { return m_pimpl->GetWindow(); }

 
 

-    // Measure cumulative width of text after each character
-    bool GetPartialTextExtents(const wxString& text, wxArrayInt& widths) const
-        { return DoGetPartialTextExtents(text, widths); }
+    bool IsOk() const
+        { return m_pimpl && m_pimpl->IsOk(); }
+
+    // query capabilities

 
 

+    bool CanDrawBitmap() const
+        { return m_pimpl->CanDrawBitmap(); }
+    bool CanGetTextExtent() const
+        { return m_pimpl->CanGetTextExtent(); }

 
 

-    // size and resolution
-    // -------------------
+    // query dimension, colour deps, resolution

 
 

-    // in device units

     void GetSize(int *width, int *height) const
     void GetSize(int *width, int *height) const

-        { DoGetSize(width, height); }
+        { m_pimpl->DoGetSize(width, height); }

     wxSize GetSize() const
     wxSize GetSize() const

-    {
-        int w, h;
-        DoGetSize(&w, &h);
-
-        return wxSize(w, h);
-    }
+        { return m_pimpl->GetSize(); }

 
 

-    // in mm

     void GetSizeMM(int* width, int* height) const
     void GetSizeMM(int* width, int* height) const

-        { DoGetSizeMM(width, height); }
+        { m_pimpl->DoGetSizeMM(width, height); }

     wxSize GetSizeMM() const
     {
         int w, h;
     wxSize GetSizeMM() const
     {
         int w, h;

-        DoGetSizeMM(&w, &h);
-
+        m_pimpl->DoGetSizeMM(&w, &h);

         return wxSize(w, h);
     }
 
         return wxSize(w, h);
     }
 

-    // coordinates conversions
-    // -----------------------
+    int GetDepth() const
+        { return m_pimpl->GetDepth(); }
+    wxSize GetPPI() const
+        { return m_pimpl->GetPPI(); }

 
 

-    // This group of functions does actual conversion of the input, as you'd
-    // expect.
-    wxCoord DeviceToLogicalX(wxCoord x) const;
-    wxCoord DeviceToLogicalY(wxCoord y) const;
-    wxCoord DeviceToLogicalXRel(wxCoord x) const;
-    wxCoord DeviceToLogicalYRel(wxCoord y) const;
-    wxCoord LogicalToDeviceX(wxCoord x) const;
-    wxCoord LogicalToDeviceY(wxCoord y) const;
-    wxCoord LogicalToDeviceXRel(wxCoord x) const;
-    wxCoord LogicalToDeviceYRel(wxCoord y) const;
+    virtual int GetResolution()
+        { return m_pimpl->GetResolution(); }

 
 

-    // query DC capabilities
-    // ---------------------
+    // Right-To-Left (RTL) modes

 
 

-    virtual bool CanDrawBitmap() const = 0;
-    virtual bool CanGetTextExtent() const = 0;
+    void SetLayoutDirection(wxLayoutDirection dir)
+        { m_pimpl->SetLayoutDirection( dir ); }
+    wxLayoutDirection GetLayoutDirection() const
+        { return m_pimpl->GetLayoutDirection(); }

 
 

-    // colour depth
-    virtual int GetDepth() const = 0;
+    // page and document

 
 

-    // Resolution in Pixels per inch
-    virtual wxSize GetPPI() const = 0;
+    bool StartDoc(const wxString& message)
+        { return m_pimpl->StartDoc(message); }
+    void EndDoc()
+        { m_pimpl->EndDoc(); }

 
 

-    virtual bool Ok() const { return IsOk(); }
-    virtual bool IsOk() const { return m_ok; }
+    void StartPage()
+        { m_pimpl->StartPage(); }
+    void EndPage()
+        { m_pimpl->EndPage(); }

 
 

-    // accessors and setters
-    // ---------------------
+    // bounding box

 
 

-    virtual int GetBackgroundMode() const { return m_backgroundMode; }
-    virtual const wxBrush&  GetBackground() const { return m_backgroundBrush; }
-    virtual const wxBrush&  GetBrush() const { return m_brush; }
-    virtual const wxFont&   GetFont() const { return m_font; }
-    virtual const wxPen&    GetPen() const { return m_pen; }
+    void CalcBoundingBox(wxCoord x, wxCoord y)
+        { m_pimpl->CalcBoundingBox(x,y); }
+    void ResetBoundingBox()
+        { m_pimpl->ResetBoundingBox(); }
+
+    wxCoord MinX() const
+        { return m_pimpl->MinX(); }
+    wxCoord MaxX() const
+        { return m_pimpl->MaxX(); }
+    wxCoord MinY() const
+        { return m_pimpl->MinY(); }
+    wxCoord MaxY() const
+        { return m_pimpl->MaxY(); }
+
+    // setters and getters
+
+    void SetFont(const wxFont& font)
+        { m_pimpl->SetFont( font ); }
+    const wxFont&   GetFont() const
+        { return m_pimpl->GetFont(); }
+
+    void SetPen(const wxPen& pen)
+        { m_pimpl->SetPen( pen ); }
+    const wxPen&    GetPen() const
+        { return m_pimpl->GetPen(); }
+
+    void SetBrush(const wxBrush& brush)
+        { m_pimpl->SetBrush( brush ); }
+    const wxBrush&  GetBrush() const
+        { return m_pimpl->GetBrush(); }
+
+    void SetBackground(const wxBrush& brush)
+        { m_pimpl->SetBackground( brush ); }
+    const wxBrush&  GetBackground() const
+        { return m_pimpl->GetBackground(); }
+
+    void SetBackgroundMode(int mode)
+        { m_pimpl->SetBackgroundMode( mode ); }
+    int GetBackgroundMode() const
+        { return m_pimpl->GetBackgroundMode(); }
+
+    void SetTextForeground(const wxColour& colour)
+        { m_pimpl->SetTextForeground(colour); }
+    const wxColour& GetTextForeground() const
+        { return m_pimpl->GetTextForeground(); }
+
+    void SetTextBackground(const wxColour& colour)
+        { m_pimpl->SetTextBackground(colour); }
+    const wxColour& GetTextBackground() const
+        { return m_pimpl->GetTextBackground(); }

 
 

-    virtual const wxColour& GetTextForeground() const { return m_textForegroundColour; }
-    virtual const wxColour& GetTextBackground() const { return m_textBackgroundColour; }
-    virtual void SetTextForeground(const wxColour& colour)
-        { m_textForegroundColour = colour; }
-    virtual void SetTextBackground(const wxColour& colour)
-        { m_textBackgroundColour = colour; }
+#if wxUSE_PALETTE
+    void SetPalette(const wxPalette& palette)
+        { m_pimpl->SetPalette(palette); }
+#endif // wxUSE_PALETTE

 
 

-    virtual int GetMapMode() const { return m_mappingMode; }
-    virtual void SetMapMode(int mode) = 0;
+    // logical functions

 
 

-    virtual void GetUserScale(double *x, double *y) const
-    {
-        if ( x ) *x = m_userScaleX;
-        if ( y ) *y = m_userScaleY;
-    }
-    virtual void SetUserScale(double x, double y) = 0;
+    void SetLogicalFunction(int function)
+        { m_pimpl->SetLogicalFunction(function); }
+    int GetLogicalFunction() const
+        { return m_pimpl->GetLogicalFunction(); }

 
 

-    virtual void GetLogicalScale(double *x, double *y)
+    // text measurement
+
+    wxCoord GetCharHeight() const
+        { return m_pimpl->GetCharHeight(); }
+    wxCoord GetCharWidth() const
+        { return m_pimpl->GetCharWidth(); }
+
+    void GetTextExtent(const wxString& string,
+                       wxCoord *x, wxCoord *y,
+                       wxCoord *descent = NULL,
+                       wxCoord *externalLeading = NULL,
+                       const wxFont *theFont = NULL) const
+        { m_pimpl->DoGetTextExtent(string, x, y, descent, externalLeading, theFont); }
+
+    wxSize GetTextExtent(const wxString& string) const

     {
     {

-        if ( x ) *x = m_logicalScaleX;
-        if ( y ) *y = m_logicalScaleY;
+        wxCoord w, h;
+        m_pimpl->DoGetTextExtent(string, &w, &h);
+        return wxSize(w, h);

     }
     }

-    virtual void SetLogicalScale(double x, double y)
+
+    void GetMultiLineTextExtent(const wxString& string,
+                                        wxCoord *width,
+                                        wxCoord *height,
+                                        wxCoord *heightLine = NULL,
+                                        const wxFont *font = NULL) const
+        { m_pimpl->GetMultiLineTextExtent( string, width, height, heightLine, font ); }
+
+    wxSize GetMultiLineTextExtent(const wxString& string) const

     {
     {

-        m_logicalScaleX = x;
-        m_logicalScaleY = y;
+        wxCoord w, h;
+        m_pimpl->GetMultiLineTextExtent(string, &w, &h);
+        return wxSize(w, h);

     }
 
     }
 

+    bool GetPartialTextExtents(const wxString& text, wxArrayInt& widths) const
+        { return m_pimpl->DoGetPartialTextExtents(text, widths); }
+
+    // clearing
+
+    void Clear()
+        { m_pimpl->Clear(); }
+
+    // clipping
+
+    void SetClippingRegion(wxCoord x, wxCoord y, wxCoord width, wxCoord height)
+        { m_pimpl->DoSetClippingRegion(x, y, width, height); }
+    void SetClippingRegion(const wxPoint& pt, const wxSize& sz)
+        { m_pimpl->DoSetClippingRegion(pt.x, pt.y, sz.x, sz.y); }
+    void SetClippingRegion(const wxRect& rect)
+        { m_pimpl->DoSetClippingRegion(rect.x, rect.y, rect.width, rect.height); }
+    void SetClippingRegion(const wxRegion& region)
+        { m_pimpl->DoSetClippingRegionAsRegion(region); }
+
+    void DestroyClippingRegion()
+        { m_pimpl->DestroyClippingRegion(); }
+
+    void GetClippingBox(wxCoord *x, wxCoord *y, wxCoord *w, wxCoord *h) const
+        { m_pimpl->DoGetClippingBox(x, y, w, h); }
+    void GetClippingBox(wxRect& rect) const
+        { m_pimpl->DoGetClippingBox(&rect.x, &rect.y, &rect.width, &rect.height); }
+
+    // coordinates conversions and transforms
+
+    wxCoord DeviceToLogicalX(wxCoord x) const
+        { return m_pimpl->DeviceToLogicalX(x); }
+    wxCoord DeviceToLogicalY(wxCoord y) const
+        { return m_pimpl->DeviceToLogicalY(y); }
+    wxCoord DeviceToLogicalXRel(wxCoord x) const
+        { return m_pimpl->DeviceToLogicalXRel(x); }
+    wxCoord DeviceToLogicalYRel(wxCoord y) const
+        { return m_pimpl->DeviceToLogicalYRel(y); }
+    wxCoord LogicalToDeviceX(wxCoord x) const
+        { return m_pimpl->LogicalToDeviceX(x); }
+    wxCoord LogicalToDeviceY(wxCoord y) const
+        { return m_pimpl->LogicalToDeviceY(y); }
+    wxCoord LogicalToDeviceXRel(wxCoord x) const
+        { return m_pimpl->LogicalToDeviceXRel(x); }
+    wxCoord LogicalToDeviceYRel(wxCoord y) const
+        { return m_pimpl->LogicalToDeviceYRel(y); }
+
+    void SetMapMode(int mode)
+        { m_pimpl->SetMapMode(mode); }
+    int GetMapMode() const
+        { return m_pimpl->GetMapMode(); }
+
+    void SetUserScale(double x, double y)
+        { m_pimpl->SetUserScale(x,y); }
+    void GetUserScale(double *x, double *y) const
+        { m_pimpl->GetUserScale( x, y ); }
+
+    void SetLogicalScale(double x, double y)
+        { m_pimpl->SetLogicalScale( x, y ); }
+    void GetLogicalScale(double *x, double *y)
+        { m_pimpl->GetLogicalScale( x, y ); }
+
+    void SetLogicalOrigin(wxCoord x, wxCoord y)
+        { m_pimpl->SetLogicalOrigin(x,y); }

     void GetLogicalOrigin(wxCoord *x, wxCoord *y) const
     void GetLogicalOrigin(wxCoord *x, wxCoord *y) const

-        { DoGetLogicalOrigin(x, y); }
+        { m_pimpl->DoGetLogicalOrigin(x, y); }

     wxPoint GetLogicalOrigin() const
     wxPoint GetLogicalOrigin() const

-        { wxCoord x, y; DoGetLogicalOrigin(&x, &y); return wxPoint(x, y); }
-    virtual void SetLogicalOrigin(wxCoord x, wxCoord y) = 0;
+        { wxCoord x, y; m_pimpl->DoGetLogicalOrigin(&x, &y); return wxPoint(x, y); }

 
 

+    void SetDeviceOrigin(wxCoord x, wxCoord y)
+        { m_pimpl->SetDeviceOrigin( x, y); }

     void GetDeviceOrigin(wxCoord *x, wxCoord *y) const
     void GetDeviceOrigin(wxCoord *x, wxCoord *y) const

-        { DoGetDeviceOrigin(x, y); }
+        { m_pimpl->DoGetDeviceOrigin(x, y); }

     wxPoint GetDeviceOrigin() const
     wxPoint GetDeviceOrigin() const

-        { wxCoord x, y; DoGetDeviceOrigin(&x, &y); return wxPoint(x, y); }
-    virtual void SetDeviceOrigin(wxCoord x, wxCoord y) = 0;
+        { wxCoord x, y; m_pimpl->DoGetDeviceOrigin(&x, &y); return wxPoint(x, y); }

 
 

-    virtual void ComputeScaleAndOrigin() {}
+    void SetAxisOrientation(bool xLeftRight, bool yBottomUp)
+        { m_pimpl->SetAxisOrientation(xLeftRight, yBottomUp); }

 
 

-    virtual void SetAxisOrientation(bool xLeftRight, bool yBottomUp) = 0;
-
-    virtual int GetLogicalFunction() const { return m_logicalFunction; }
-    virtual void SetLogicalFunction(int function) = 0;
+    // mostly internal
+    void SetDeviceLocalOrigin( wxCoord x, wxCoord y )
+        { m_pimpl->SetDeviceLocalOrigin( x, y ); }

 
 

-#if WXWIN_COMPATIBILITY_2_4
-    virtual void SetOptimization(bool WXUNUSED(opt)) { }
-    virtual bool GetOptimization() { return false; }
-#endif

 
 

-    // bounding box
-    // ------------
+    // draw generic object

 
 

-    virtual void CalcBoundingBox(wxCoord x, wxCoord y)
+    void DrawObject(wxDrawObject* drawobject)

     {
     {

-      if ( m_isBBoxValid )
-      {
-         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;
-      }
-      else
-      {
-         m_isBBoxValid = true;
-
-         m_minX = x;
-         m_minY = y;
-         m_maxX = x;
-         m_maxY = y;
-      }
+        drawobject->Draw(*this);
+        CalcBoundingBox(drawobject->MinX(),drawobject->MinY());
+        CalcBoundingBox(drawobject->MaxX(),drawobject->MaxY());

     }
 
     }
 

-    void ResetBoundingBox()
-    {
-        m_isBBoxValid = false;
-
-        m_minX = m_maxX = m_minY = m_maxY = 0;
-    }
+    // -----------------------------------------------
+    // the actual drawing API

 
 

-    // Get the final bounding box of the PostScript or Metafile picture.
-    wxCoord MinX() const { return m_minX; }
-    wxCoord MaxX() const { return m_maxX; }
-    wxCoord MinY() const { return m_minY; }
-    wxCoord MaxY() const { return m_maxY; }
+    bool FloodFill(wxCoord x, wxCoord y, const wxColour& col,
+                   int style = wxFLOOD_SURFACE)
+        { return m_pimpl->DoFloodFill(x, y, col, style); }
+    bool FloodFill(const wxPoint& pt, const wxColour& col,
+                   int style = wxFLOOD_SURFACE)
+        { return m_pimpl->DoFloodFill(pt.x, pt.y, col, style); }

 
 

-    // misc old functions
-    // ------------------
+    // fill the area specified by rect with a radial gradient, starting from
+    // initialColour in the centre of the cercle and fading to destColour.
+    void GradientFillConcentric(const wxRect& rect,
+                                const wxColour& initialColour,
+                                const wxColour& destColour)
+        { m_pimpl->DoGradientFillConcentric( rect, initialColour, destColour,
+                                             wxPoint(rect.GetWidth() / 2,
+                                                     rect.GetHeight() / 2)); }

 
 

-    // for compatibility with the old code when wxCoord was long everywhere
-    void GetTextExtent(const wxString& string,
-                       long *x, long *y,
-                       long *descent = NULL,
-                       long *externalLeading = NULL,
-                       wxFont *theFont = NULL) const
-    {
-        wxCoord x2, y2, descent2, externalLeading2;
-        DoGetTextExtent(string, &x2, &y2,
-                        &descent2, &externalLeading2,
-                        theFont);
-        if ( x )
-            *x = x2;
-        if ( y )
-            *y = y2;
-        if ( descent )
-            *descent = descent2;
-        if ( externalLeading )
-            *externalLeading = externalLeading2;
-    }
+    void GradientFillConcentric(const wxRect& rect,
+                                const wxColour& initialColour,
+                                const wxColour& destColour,
+                                const wxPoint& circleCenter)
+        { m_pimpl->DoGradientFillConcentric(rect, initialColour, destColour, circleCenter); }

 
 

-    void GetLogicalOrigin(long *x, long *y) const
-    {
-        wxCoord x2, y2;
-        DoGetLogicalOrigin(&x2, &y2);
-        if ( x )
-            *x = x2;
-        if ( y )
-            *y = y2;
-    }
+    // fill the area specified by rect with a linear gradient
+    void GradientFillLinear(const wxRect& rect,
+                            const wxColour& initialColour,
+                            const wxColour& destColour,
+                            wxDirection nDirection = wxEAST)
+        { m_pimpl->DoGradientFillLinear(rect, initialColour, destColour, nDirection); }

 
 

-    void GetDeviceOrigin(long *x, long *y) const
-    {
-        wxCoord x2, y2;
-        DoGetDeviceOrigin(&x2, &y2);
-        if ( x )
-            *x = x2;
-        if ( y )
-            *y = y2;
-    }
-    void GetClippingBox(long *x, long *y, long *w, long *h) const
-    {
-        wxCoord xx,yy,ww,hh;
-        DoGetClippingBox(&xx, &yy, &ww, &hh);
-        if (x) *x = xx;
-        if (y) *y = yy;
-        if (w) *w = ww;
-        if (h) *h = hh;
-    }
+    bool GetPixel(wxCoord x, wxCoord y, wxColour *col) const
+        { return m_pimpl->DoGetPixel(x, y, col); }
+    bool GetPixel(const wxPoint& pt, wxColour *col) const
+        { return m_pimpl->DoGetPixel(pt.x, pt.y, col); }

 
 

-    // RTL related functions
-    // ---------------------
+    void DrawLine(wxCoord x1, wxCoord y1, wxCoord x2, wxCoord y2)
+        { m_pimpl->DoDrawLine(x1, y1, x2, y2); }
+    void DrawLine(const wxPoint& pt1, const wxPoint& pt2)
+        { m_pimpl->DoDrawLine(pt1.x, pt1.y, pt2.x, pt2.y); }

 
 

-    // get or change the layout direction (LTR or RTL) for this dc,
-    // wxLayout_Default is returned if layout direction is not supported
-    virtual wxLayoutDirection GetLayoutDirection() const
-        { return wxLayout_Default; }
-    virtual void SetLayoutDirection(wxLayoutDirection WXUNUSED(dir))
-        { }
+    void CrossHair(wxCoord x, wxCoord y)
+        { m_pimpl->DoCrossHair(x, y); }
+    void CrossHair(const wxPoint& pt)
+        { m_pimpl->DoCrossHair(pt.x, pt.y); }

 
 

-protected:
-    // the pure virtual functions which should be implemented by wxDC
-    virtual bool DoFloodFill(wxCoord x, wxCoord y, const wxColour& col,
-                             int style = wxFLOOD_SURFACE) = 0;
+    void DrawArc(wxCoord x1, wxCoord y1, wxCoord x2, wxCoord y2,
+                 wxCoord xc, wxCoord yc)
+        { m_pimpl->DoDrawArc(x1, y1, x2, y2, xc, yc); }
+    void DrawArc(const wxPoint& pt1, const wxPoint& pt2, const wxPoint& centre)
+        { m_pimpl->DoDrawArc(pt1.x, pt1.y, pt2.x, pt2.y, centre.x, centre.y); }

 
 

-    virtual void DoGradientFillLinear(const wxRect& rect,
-                                      const wxColour& initialColour,
-                                      const wxColour& destColour,
-                                      wxDirection nDirection = wxEAST);
+    void DrawCheckMark(wxCoord x, wxCoord y,
+                       wxCoord width, wxCoord height)
+        { m_pimpl->DoDrawCheckMark(x, y, width, height); }
+    void DrawCheckMark(const wxRect& rect)
+        { m_pimpl->DoDrawCheckMark(rect.x, rect.y, rect.width, rect.height); }

 
 

-    virtual void DoGradientFillConcentric(const wxRect& rect,
-                                        const wxColour& initialColour,
-                                        const wxColour& destColour,
-                                        const wxPoint& circleCenter);
+    void DrawEllipticArc(wxCoord x, wxCoord y, wxCoord w, wxCoord h,
+                         double sa, double ea)
+        { m_pimpl->DoDrawEllipticArc(x, y, w, h, sa, ea); }
+    void DrawEllipticArc(const wxPoint& pt, const wxSize& sz,
+                         double sa, double ea)
+        { m_pimpl->DoDrawEllipticArc(pt.x, pt.y, sz.x, sz.y, sa, ea); }

 
 

-    virtual bool DoGetPixel(wxCoord x, wxCoord y, wxColour *col) const = 0;
+    void DrawPoint(wxCoord x, wxCoord y)
+        { m_pimpl->DoDrawPoint(x, y); }
+    void DrawPoint(const wxPoint& pt)
+        { m_pimpl->DoDrawPoint(pt.x, pt.y); }

 
 

-    virtual void DoDrawPoint(wxCoord x, wxCoord y) = 0;
-    virtual void DoDrawLine(wxCoord x1, wxCoord y1, wxCoord x2, wxCoord y2) = 0;
+    void DrawLines(int n, wxPoint points[],
+                   wxCoord xoffset = 0, wxCoord yoffset = 0)
+        { m_pimpl->DoDrawLines(n, points, xoffset, yoffset); }
+    void DrawLines(const wxPointList *list,
+                   wxCoord xoffset = 0, wxCoord yoffset = 0)
+        { m_pimpl->DrawLines( list, xoffset, yoffset ); }
+#if WXWIN_COMPATIBILITY_2_8
+    wxDEPRECATED( void DrawLines(const wxList *list,
+                                 wxCoord xoffset = 0, wxCoord yoffset = 0) );
+#endif  // WXWIN_COMPATIBILITY_2_8

 
 

-    virtual void DoDrawArc(wxCoord x1, wxCoord y1,
-                           wxCoord x2, wxCoord y2,
-                           wxCoord xc, wxCoord yc) = 0;
-    virtual void DoDrawCheckMark(wxCoord x, wxCoord y,
-                                 wxCoord width, wxCoord height);
-    virtual void DoDrawEllipticArc(wxCoord x, wxCoord y, wxCoord w, wxCoord h,
-                                   double sa, double ea) = 0;
+    void DrawPolygon(int n, wxPoint points[],
+                     wxCoord xoffset = 0, wxCoord yoffset = 0,
+                     int fillStyle = wxODDEVEN_RULE)
+        { m_pimpl->DoDrawPolygon(n, points, xoffset, yoffset, fillStyle); }
+    void DrawPolygon(const wxPointList *list,
+                     wxCoord xoffset = 0, wxCoord yoffset = 0,
+                     int fillStyle = wxODDEVEN_RULE)
+        { m_pimpl->DrawPolygon( list, xoffset, yoffset, fillStyle ); }
+    void DrawPolyPolygon(int n, int count[], wxPoint points[],
+                         wxCoord xoffset = 0, wxCoord yoffset = 0,
+                         int fillStyle = wxODDEVEN_RULE)
+        { m_pimpl->DoDrawPolyPolygon(n, count, points, xoffset, yoffset, fillStyle); }
+#if WXWIN_COMPATIBILITY_2_8
+    wxDEPRECATED( void DrawPolygon(const wxList *list,
+                     wxCoord xoffset = 0, wxCoord yoffset = 0,
+                     int fillStyle = wxODDEVEN_RULE) );
+#endif  // WXWIN_COMPATIBILITY_2_8

 
 

-    virtual void DoDrawRectangle(wxCoord x, wxCoord y, wxCoord width, wxCoord height) = 0;
-    virtual void DoDrawRoundedRectangle(wxCoord x, wxCoord y,
-                                        wxCoord width, wxCoord height,
-                                        double radius) = 0;
-    virtual void DoDrawEllipse(wxCoord x, wxCoord y,
-                               wxCoord width, wxCoord height) = 0;
+    void DrawRectangle(wxCoord x, wxCoord y, wxCoord width, wxCoord height)
+        { m_pimpl->DoDrawRectangle(x, y, width, height); }
+    void DrawRectangle(const wxPoint& pt, const wxSize& sz)
+        { m_pimpl->DoDrawRectangle(pt.x, pt.y, sz.x, sz.y); }
+    void DrawRectangle(const wxRect& rect)
+        { m_pimpl->DoDrawRectangle(rect.x, rect.y, rect.width, rect.height); }

 
 

-    virtual void DoCrossHair(wxCoord x, wxCoord y) = 0;
+    void DrawRoundedRectangle(wxCoord x, wxCoord y, wxCoord width, wxCoord height,
+                              double radius)
+        { m_pimpl->DoDrawRoundedRectangle(x, y, width, height, radius); }
+    void DrawRoundedRectangle(const wxPoint& pt, const wxSize& sz,
+                             double radius)
+        { m_pimpl->DoDrawRoundedRectangle(pt.x, pt.y, sz.x, sz.y, radius); }
+    void DrawRoundedRectangle(const wxRect& r, double radius)
+        { m_pimpl->DoDrawRoundedRectangle(r.x, r.y, r.width, r.height, radius); }

 
 

-    virtual void DoDrawIcon(const wxIcon& icon, wxCoord x, wxCoord y) = 0;
-    virtual void DoDrawBitmap(const wxBitmap &bmp, wxCoord x, wxCoord y,
-                              bool useMask = false) = 0;
+    void DrawCircle(wxCoord x, wxCoord y, wxCoord radius)
+        { m_pimpl->DoDrawEllipse(x - radius, y - radius, 2*radius, 2*radius); }
+    void DrawCircle(const wxPoint& pt, wxCoord radius)
+        { m_pimpl->DoDrawEllipse(pt.x - radius, pt.y - radius, 2*radius, 2*radius); }

 
 

-    virtual void DoDrawText(const wxString& text, wxCoord x, wxCoord y) = 0;
-    virtual void DoDrawRotatedText(const wxString& text,
-                                   wxCoord x, wxCoord y, double angle) = 0;
+    void DrawEllipse(wxCoord x, wxCoord y, wxCoord width, wxCoord height)
+        { m_pimpl->DoDrawEllipse(x, y, width, height); }
+    void DrawEllipse(const wxPoint& pt, const wxSize& sz)
+        { m_pimpl->DoDrawEllipse(pt.x, pt.y, sz.x, sz.y); }
+    void DrawEllipse(const wxRect& rect)
+        { m_pimpl->DoDrawEllipse(rect.x, rect.y, rect.width, rect.height); }

 
 

-    virtual bool DoBlit(wxCoord xdest, wxCoord ydest,
-                        wxCoord width, wxCoord height,
-                        wxDC *source, wxCoord xsrc, wxCoord ysrc,
-                        int rop = wxCOPY, bool useMask = false, wxCoord xsrcMask = wxDefaultCoord, wxCoord ysrcMask = wxDefaultCoord) = 0;
+    void DrawIcon(const wxIcon& icon, wxCoord x, wxCoord y)
+        { m_pimpl->DoDrawIcon(icon, x, y); }
+    void DrawIcon(const wxIcon& icon, const wxPoint& pt)
+        { m_pimpl->DoDrawIcon(icon, pt.x, pt.y); }

 
 

-    virtual void DoGetSize(int *width, int *height) const = 0;
-    virtual void DoGetSizeMM(int* width, int* height) const = 0;
+    void DrawBitmap(const wxBitmap &bmp, wxCoord x, wxCoord y,
+                    bool useMask = false)
+        { m_pimpl->DoDrawBitmap(bmp, x, y, useMask); }
+    void DrawBitmap(const wxBitmap &bmp, const wxPoint& pt,
+                    bool useMask = false)
+        { m_pimpl->DoDrawBitmap(bmp, pt.x, pt.y, useMask); }

 
 

-    virtual void DoDrawLines(int n, wxPoint points[],
-                             wxCoord xoffset, wxCoord yoffset) = 0;
-    virtual void DoDrawPolygon(int n, wxPoint points[],
-                               wxCoord xoffset, wxCoord yoffset,
-                               int fillStyle = wxODDEVEN_RULE) = 0;
-    virtual void DoDrawPolyPolygon(int n, int count[], wxPoint points[],
-                               wxCoord xoffset, wxCoord yoffset,
-                               int fillStyle);
+    void DrawText(const wxString& text, wxCoord x, wxCoord y)
+        { m_pimpl->DoDrawText(text, x, y); }
+    void DrawText(const wxString& text, const wxPoint& pt)
+        { m_pimpl->DoDrawText(text, pt.x, pt.y); }

 
 

-    virtual void DoSetClippingRegionAsRegion(const wxRegion& region) = 0;
-    virtual void DoSetClippingRegion(wxCoord x, wxCoord y,
-                                     wxCoord width, wxCoord height) = 0;
+    void DrawRotatedText(const wxString& text, wxCoord x, wxCoord y, double angle)
+        { m_pimpl->DoDrawRotatedText(text, x, y, angle); }
+    void DrawRotatedText(const wxString& text, const wxPoint& pt, double angle)
+        { m_pimpl->DoDrawRotatedText(text, pt.x, pt.y, angle); }

 
 

-#if WXWIN_COMPATIBILITY_2_4
-    // this was only for confusing people, use DoGetClippingBox only
-    virtual void DoGetClippingRegion(wxCoord *x, wxCoord *y,
-                                     wxCoord *w, wxCoord *h)
-        { DoGetClippingBox(x, y, w, h); }
-#endif
+    // this version puts both optional bitmap and the text into the given
+    // rectangle and aligns is as specified by alignment parameter; it also
+    // will emphasize the character with the given index if it is != -1 and
+    // return the bounding rectangle if required
+    void DrawLabel(const wxString& text,
+                           const wxBitmap& image,
+                           const wxRect& rect,
+                           int alignment = wxALIGN_LEFT | wxALIGN_TOP,
+                           int indexAccel = -1,
+                           wxRect *rectBounding = NULL);

 
 

-    virtual void DoGetClippingBox(wxCoord *x, wxCoord *y,
-                                  wxCoord *w, wxCoord *h) const
+    void DrawLabel(const wxString& text, const wxRect& rect,
+                   int alignment = wxALIGN_LEFT | wxALIGN_TOP,
+                   int indexAccel = -1)
+        { DrawLabel(text, wxNullBitmap, rect, alignment, indexAccel); }
+
+    bool Blit(wxCoord xdest, wxCoord ydest, wxCoord width, wxCoord height,
+              wxDC *source, wxCoord xsrc, wxCoord ysrc,
+              int rop = wxCOPY, bool useMask = false, wxCoord xsrcMask = wxDefaultCoord, wxCoord ysrcMask = wxDefaultCoord)

     {
     {

-        if ( x )
-            *x = m_clipX1;
-        if ( y )
-            *y = m_clipY1;
-        if ( w )
-            *w = m_clipX2 - m_clipX1;
-        if ( h )
-            *h = m_clipY2 - m_clipY1;
+        return m_pimpl->DoBlit(xdest, ydest, width, height,
+                      source, xsrc, ysrc, rop, useMask, xsrcMask, ysrcMask);

     }
     }

-
-    virtual void DoGetLogicalOrigin(wxCoord *x, wxCoord *y) const
+    bool Blit(const wxPoint& destPt, const wxSize& sz,
+              wxDC *source, const wxPoint& srcPt,
+              int rop = wxCOPY, bool useMask = false, const wxPoint& srcPtMask = wxDefaultPosition)

     {
     {

-        if ( x ) *x = m_logicalOriginX;
-        if ( y ) *y = m_logicalOriginY;
+        return m_pimpl->DoBlit(destPt.x, destPt.y, sz.x, sz.y,
+                      source, srcPt.x, srcPt.y, rop, useMask, srcPtMask.x, srcPtMask.y);

     }
 
     }
 

-    virtual void DoGetDeviceOrigin(wxCoord *x, wxCoord *y) const
+    bool StretchBlit(wxCoord dstX, wxCoord dstY,
+                     wxCoord dstWidth, wxCoord dstHeight,
+                     wxDC *source,
+                     wxCoord srcX, wxCoord srcY,
+                     wxCoord srcWidth, wxCoord srcHeight,
+                     int rop = wxCOPY, bool useMask = false,
+                     wxCoord srcMaskX = wxDefaultCoord, wxCoord srcMaskY = wxDefaultCoord)

     {
     {

-        if ( x ) *x = m_deviceOriginX;
-        if ( y ) *y = m_deviceOriginY;
+        return m_pimpl->DoStretchBlit(dstX, dstY, dstWidth, dstHeight,
+                      source, srcX, srcY, srcWidth, srcHeight, rop, useMask, srcMaskX, srcMaskY);

     }
     }

-
-    virtual void DoGetTextExtent(const wxString& string,
-                                 wxCoord *x, wxCoord *y,
-                                 wxCoord *descent = NULL,
-                                 wxCoord *externalLeading = NULL,
-                                 wxFont *theFont = NULL) const = 0;
-
-    virtual bool DoGetPartialTextExtents(const wxString& text, wxArrayInt& widths) const;
-
-#if wxUSE_SPLINES
-    virtual void DoDrawSpline(wxList *points);
-#endif
-
-protected:
-    // unset clipping variables (after clipping region was destroyed)
-    void ResetClipping()
+    bool StretchBlit(const wxPoint& dstPt, const wxSize& dstSize,
+                     wxDC *source, const wxPoint& srcPt, const wxSize& srcSize,
+                     int rop = wxCOPY, bool useMask = false, const wxPoint& srcMaskPt = wxDefaultPosition)

     {
     {

-        m_clipping = false;
-
-        m_clipX1 = m_clipX2 = m_clipY1 = m_clipY2 = 0;
+        return m_pimpl->DoStretchBlit(dstPt.x, dstPt.y, dstSize.x, dstSize.y,
+                      source, srcPt.x, srcPt.y, srcSize.x, srcSize.y, rop, useMask, srcMaskPt.x, srcMaskPt.y);

     }
 
     }
 

-    // flags
-    bool m_colour:1;
-    bool m_ok:1;
-    bool m_clipping:1;
-    bool m_isInteractive:1;
-    bool m_isBBoxValid:1;
-
-    // coordinate system variables
-
-    // TODO short descriptions of what exactly they are would be nice...
-
-    wxCoord m_logicalOriginX, m_logicalOriginY;
-    wxCoord m_deviceOriginX, m_deviceOriginY;
+    wxBitmap GetAsBitmap(const wxRect *subrect = (const wxRect *) NULL) const
+    {
+        return m_pimpl->DoGetAsBitmap(subrect);
+    }

 
 

-    double m_logicalScaleX, m_logicalScaleY;
-    double m_userScaleX, m_userScaleY;
-    double m_scaleX, m_scaleY;
+#if wxUSE_SPLINES
+    void DrawSpline(wxCoord x1, wxCoord y1,
+                    wxCoord x2, wxCoord y2,
+                    wxCoord x3, wxCoord y3)
+        { m_pimpl->DoDrawSpline(x1,y1,x2,y2,x3,y3); }
+    void DrawSpline(int n, wxPoint points[])
+        { m_pimpl->DoDrawSpline(n,points); }
+    void DrawSpline(const wxPointList *points)
+        { m_pimpl->DoDrawSpline(points); }
+#endif // wxUSE_SPLINES

 
 

-    // Used by SetAxisOrientation() to invert the axes
-    int m_signX, m_signY;

 
 

-    // bounding and clipping boxes
-    wxCoord m_minX, m_minY, m_maxX, m_maxY;
-    wxCoord m_clipX1, m_clipY1, m_clipX2, m_clipY2;
+#if WXWIN_COMPATIBILITY_2_8
+    // for compatibility with the old code when wxCoord was long everywhere
+    wxDEPRECATED( void GetTextExtent(const wxString& string,
+                       long *x, long *y,
+                       long *descent = NULL,
+                       long *externalLeading = NULL,
+                       const wxFont *theFont = NULL) const );
+    wxDEPRECATED( void GetLogicalOrigin(long *x, long *y) const );
+    wxDEPRECATED( void GetDeviceOrigin(long *x, long *y) const );
+    wxDEPRECATED( void GetClippingBox(long *x, long *y, long *w, long *h) const );
+#endif  // WXWIN_COMPATIBILITY_2_8

 
 

-    int m_logicalFunction;
-    int m_backgroundMode;
-    int m_mappingMode;

 
 

-    // GDI objects
-    wxPen             m_pen;
-    wxBrush           m_brush;
-    wxBrush           m_backgroundBrush;
-    wxColour          m_textForegroundColour;
-    wxColour          m_textBackgroundColour;
-    wxFont            m_font;
+protected:
+    // ctor takes ownership of the pointer
+    wxDC(wxDCImpl *pimpl) : m_pimpl(pimpl) { }

 
 

-#if wxUSE_PALETTE
-    wxPalette         m_palette;
-    bool              m_hasCustomPalette;
-#endif // wxUSE_PALETTE
+    wxDCImpl * const m_pimpl;

 
 private:
 
 private:

-    DECLARE_NO_COPY_CLASS(wxDCBase)
-    DECLARE_ABSTRACT_CLASS(wxDCBase)
+    DECLARE_ABSTRACT_CLASS(wxDC)
+    DECLARE_NO_COPY_CLASS(wxDC)

 };
 
 };
 

-// ----------------------------------------------------------------------------
-// now include the declaration of wxDC class
-// ----------------------------------------------------------------------------
-
-#if defined(__WXPALMOS__)
-    #include "wx/palmos/dc.h"
-#elif defined(__WXMSW__)
-    #include "wx/msw/dc.h"
-#elif defined(__WXMOTIF__)
-    #include "wx/motif/dc.h"
-#elif defined(__WXGTK20__)
-    #include "wx/gtk/dc.h"
-#elif defined(__WXGTK__)
-    #include "wx/gtk1/dc.h"
-#elif defined(__WXX11__)
-    #include "wx/x11/dc.h"
-#elif defined(__WXMGL__)
-    #include "wx/mgl/dc.h"
-#elif defined(__WXDFB__)
-    #include "wx/dfb/dc.h"
-#elif defined(__WXMAC__)
-    #include "wx/mac/dc.h"
-#elif defined(__WXCOCOA__)
-    #include "wx/cocoa/dc.h"
-#elif defined(__WXPM__)
-    #include "wx/os2/dc.h"
-#endif
-

 // ----------------------------------------------------------------------------
 // helper class: you can use it to temporarily change the DC text colour and
 // restore it automatically when the object goes out of scope
 // ----------------------------------------------------------------------------
 
 // ----------------------------------------------------------------------------
 // helper class: you can use it to temporarily change the DC text colour and
 // restore it automatically when the object goes out of scope
 // ----------------------------------------------------------------------------
 

-class WXDLLEXPORT wxDCTextColourChanger
+class WXDLLIMPEXP_CORE wxDCTextColourChanger

 {
 public:
     wxDCTextColourChanger(wxDC& dc) : m_dc(dc), m_colFgOld() { }
 
 {
 public:
     wxDCTextColourChanger(wxDC& dc) : m_dc(dc), m_colFgOld() { }
 

+    wxDCTextColourChanger(wxDC& dc, const wxColour& col) : m_dc(dc)
+    {
+        Set(col);
+    }
+

     ~wxDCTextColourChanger()
     {
         if ( m_colFgOld.Ok() )
     ~wxDCTextColourChanger()
     {
         if ( m_colFgOld.Ok() )


@@ -892,7 +1144,7 @@ private:
 // restore it automatically when the object goes out of scope
 // ----------------------------------------------------------------------------
 
 // restore it automatically when the object goes out of scope
 // ----------------------------------------------------------------------------
 

-class WXDLLEXPORT wxDCPenChanger
+class WXDLLIMPEXP_CORE wxDCPenChanger

 {
 public:
     wxDCPenChanger(wxDC& dc, const wxPen& pen) : m_dc(dc), m_penOld(dc.GetPen())
 {
 public:
     wxDCPenChanger(wxDC& dc, const wxPen& pen) : m_dc(dc), m_penOld(dc.GetPen())


@@ -919,7 +1171,7 @@ private:
 // restore it automatically when the object goes out of scope
 // ----------------------------------------------------------------------------
 
 // restore it automatically when the object goes out of scope
 // ----------------------------------------------------------------------------
 

-class WXDLLEXPORT wxDCBrushChanger
+class WXDLLIMPEXP_CORE wxDCBrushChanger

 {
 public:
     wxDCBrushChanger(wxDC& dc, const wxBrush& brush) : m_dc(dc), m_brushOld(dc.GetBrush())
 {
 public:
     wxDCBrushChanger(wxDC& dc, const wxBrush& brush) : m_dc(dc), m_brushOld(dc.GetBrush())


@@ -946,7 +1198,7 @@ private:
 // destroys it in the dtor
 // ----------------------------------------------------------------------------
 
 // destroys it in the dtor
 // ----------------------------------------------------------------------------
 

-class WXDLLEXPORT wxDCClipper
+class WXDLLIMPEXP_CORE wxDCClipper

 {
 public:
     wxDCClipper(wxDC& dc, const wxRegion& r) : m_dc(dc)
 {
 public:
     wxDCClipper(wxDC& dc, const wxRegion& r) : m_dc(dc)


@@ -964,72 +1216,4 @@ private:
     DECLARE_NO_COPY_CLASS(wxDCClipper)
 };
 
     DECLARE_NO_COPY_CLASS(wxDCClipper)
 };
 

-// ----------------------------------------------------------------------------
-// creates an overlay over an existing window, allowing for manipulations like
-// rubberbanding etc. this API is not stable yet, not to be used outside wx
-// internal code
-// ----------------------------------------------------------------------------
-
-class WXDLLEXPORT wxOverlayImpl;
-class WXDLLEXPORT wxWindowDC;
-
-class WXDLLEXPORT wxOverlay
-{
-public:
-    wxOverlay();
-    ~wxOverlay();
-
-    // clears the overlay without restoring the former state
-    // to be done eg when the window content has been changed and repainted
-    void Reset();
-
-private:
-    friend class WXDLLEXPORT wxDCOverlay;
-
-    // returns true if it has been setup
-    bool IsOk();
-
-    void Init(wxWindowDC* dc, int x , int y , int width , int height);
-
-    void BeginDrawing(wxWindowDC* dc);
-
-    void EndDrawing(wxWindowDC* dc);
-
-    void Clear(wxWindowDC* dc);
-
-    wxOverlayImpl* m_impl;
-
-    bool m_inDrawing;
-
-
-    DECLARE_NO_COPY_CLASS(wxOverlay);
-};
-
-class WXDLLEXPORT wxDCOverlay
-{
-public:
-    // connects this overlay to the corresponding drawing dc, if the overlay is not initialized yet
-    // this call will do so
-    wxDCOverlay(wxOverlay &overlay, wxWindowDC *dc, int x , int y , int width , int height);
-
-    // convenience wrapper that behaves the same using the entire area of the dc
-    wxDCOverlay(wxOverlay &overlay, wxWindowDC *dc);
-
-    // removes the connection between the overlay and the dc
-    virtual ~wxDCOverlay();
-
-    // clears the layer, restoring the state at the last init
-    void Clear();
-
-private:
-    void Init(wxWindowDC *dc, int x , int y , int width , int height);
-
-    wxOverlay& m_overlay;
-
-    wxWindowDC* m_dc;
-
-
-    DECLARE_NO_COPY_CLASS(wxDCOverlay);
-};
-

 #endif // _WX_DC_H_BASE_
 #endif // _WX_DC_H_BASE_