added wxUSE_REGKEY option

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

diff --git a/include/wx/graphics.h b/include/wx/graphics.h
old mode 100755 (executable)
new mode 100644 (file)
index 9f4abde..e710213
--- a/include/wx/graphics.h
+++ b/include/wx/graphics.h
@@ -12,25 +12,22 @@
 #ifndef _WX_GRAPHICS_H_
 #define _WX_GRAPHICS_H_
 
 #ifndef _WX_GRAPHICS_H_
 #define _WX_GRAPHICS_H_
 

-#if wxMAC_USE_CORE_GRAPHICS
-#undef wxUSE_GRAPHICS_CONTEXT
-#define wxUSE_GRAPHICS_CONTEXT 1
-#endif
-
-#ifndef wxUSE_GRAPHICS_CONTEXT
-#define wxUSE_GRAPHICS_CONTEXT 0
-#endif
-

 #if wxUSE_GRAPHICS_CONTEXT
 
 #if wxUSE_GRAPHICS_CONTEXT
 

-// ---------------------------------------------------------------------------
-// macros
-// ---------------------------------------------------------------------------
-

 #include "wx/geometry.h"
 #include "wx/geometry.h"

-#include "wx/dcclient.h"

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

+class WXDLLIMPEXP_FWD_CORE wxWindowDC;
+class WXDLLIMPEXP_FWD_CORE wxMemoryDC;
+class WXDLLIMPEXP_FWD_CORE wxGraphicsContext;
+class WXDLLIMPEXP_FWD_CORE wxGraphicsPath;
+class WXDLLIMPEXP_FWD_CORE wxGraphicsMatrix;
+class WXDLLIMPEXP_FWD_CORE wxGraphicsFigure;
+class WXDLLIMPEXP_FWD_CORE wxGraphicsRenderer;
+class WXDLLIMPEXP_FWD_CORE wxGraphicsPen;
+class WXDLLIMPEXP_FWD_CORE wxGraphicsBrush;
+class WXDLLIMPEXP_FWD_CORE wxGraphicsFont;
+

 /*
  * notes about the graphics context apis
  *
 /*
  * notes about the graphics context apis
  *


@@ -38,12 +35,208 @@
  * in direction of positive y axis.
  */
  
  * in direction of positive y axis.
  */
  

-class WXDLLEXPORT wxGraphicsPath
+// Base class of all objects used for drawing in the new graphics API, the always point back to their
+// originating rendering engine, there is no dynamic unloading of a renderer currently allowed, 
+// these references are not counted
+
+//
+// The data used by objects like graphics pens etc is ref counted, in order to avoid unnecessary expensive
+// duplication. Any operation on a shared instance that results in a modified state, uncouples this
+// instance from the other instances that were shared - using copy on write semantics
+//
+ 
+class WXDLLIMPEXP_CORE wxGraphicsObjectRefData : public wxObjectRefData

 {
 public :
 {
 public :

-    wxGraphicsPath() {}
-    virtual ~wxGraphicsPath() {}
+    wxGraphicsObjectRefData( wxGraphicsRenderer* renderer );
+    wxGraphicsObjectRefData( const wxGraphicsObjectRefData* data );
+    wxGraphicsRenderer* GetRenderer() const ;
+    virtual wxGraphicsObjectRefData* Clone() const ;
+
+protected :
+    wxGraphicsRenderer* m_renderer;
+} ;
+
+class WXDLLIMPEXP_CORE wxGraphicsObject : public wxObject
+{
+public :
+    wxGraphicsObject() ;
+    wxGraphicsObject( wxGraphicsRenderer* renderer ) ;
+    virtual ~wxGraphicsObject() ;

     
     

+    bool IsNull() const ;
+
+    // returns the renderer that was used to create this instance, or NULL if it has not been initialized yet
+    wxGraphicsRenderer* GetRenderer() const ;
+    wxGraphicsObjectRefData* GetGraphicsData() const ;
+protected :
+    virtual wxObjectRefData* CreateRefData() const;
+    virtual wxObjectRefData* CloneRefData(const wxObjectRefData* data) const;
+
+    DECLARE_DYNAMIC_CLASS(wxGraphicsObject)
+} ;
+
+class WXDLLIMPEXP_CORE wxGraphicsPen : public wxGraphicsObject
+{
+public :
+    wxGraphicsPen() {}
+    virtual ~wxGraphicsPen() {}
+private :
+    DECLARE_DYNAMIC_CLASS(wxGraphicsPen)
+} ;
+
+extern WXDLLEXPORT_DATA(wxGraphicsPen) wxNullGraphicsPen;
+
+class WXDLLIMPEXP_CORE wxGraphicsBrush : public wxGraphicsObject
+{
+public :
+    wxGraphicsBrush() {}
+    virtual ~wxGraphicsBrush() {}
+private :
+    DECLARE_DYNAMIC_CLASS(wxGraphicsBrush)
+} ;
+
+extern WXDLLEXPORT_DATA(wxGraphicsBrush) wxNullGraphicsBrush;
+
+class WXDLLIMPEXP_CORE wxGraphicsFont : public wxGraphicsObject
+{
+public :
+    wxGraphicsFont() {}
+    virtual ~wxGraphicsFont() {}
+private :
+    DECLARE_DYNAMIC_CLASS(wxGraphicsFont)
+} ;
+
+extern WXDLLEXPORT_DATA(wxGraphicsFont) wxNullGraphicsFont;
+
+
+class WXDLLIMPEXP_CORE wxGraphicsMatrixData : public wxGraphicsObjectRefData
+{
+public :
+    wxGraphicsMatrixData( wxGraphicsRenderer* renderer) : 
+       wxGraphicsObjectRefData(renderer) {}
+
+       virtual ~wxGraphicsMatrixData() {}
+
+       // concatenates the matrix
+       virtual void Concat( const wxGraphicsMatrixData *t ) = 0;
+
+       // sets the matrix to the respective values
+       virtual void Set(wxDouble a=1.0, wxDouble b=0.0, wxDouble c=0.0, wxDouble d=1.0, 
+           wxDouble tx=0.0, wxDouble ty=0.0) = 0;
+
+       // gets the component valuess of the matrix
+       virtual void Get(wxDouble* a=NULL, wxDouble* b=NULL,  wxDouble* c=NULL,
+                        wxDouble* d=NULL, wxDouble* tx=NULL, wxDouble* ty=NULL) const = 0;
+       
+       // makes this the inverse matrix
+       virtual void Invert() = 0;
+
+       // returns true if the elements of the transformation matrix are equal ?
+       virtual bool IsEqual( const wxGraphicsMatrixData* t) const  = 0;
+
+       // return true if this is the identity matrix
+       virtual bool IsIdentity() const = 0;
+
+       //
+       // transformation
+       //
+
+       // add the translation to this matrix
+       virtual void Translate( wxDouble dx , wxDouble dy ) = 0;
+
+       // add the scale to this matrix
+       virtual void Scale( wxDouble xScale , wxDouble yScale ) = 0;
+
+       // add the rotation to this matrix (radians)
+       virtual void Rotate( wxDouble angle ) = 0;  
+
+       //
+       // apply the transforms
+       //
+
+       // applies that matrix to the point
+       virtual void TransformPoint( wxDouble *x, wxDouble *y ) const = 0;
+
+       // applies the matrix except for translations
+       virtual void TransformDistance( wxDouble *dx, wxDouble *dy ) const =0;
+
+       // returns the native representation
+       virtual void * GetNativeMatrix() const = 0;
+} ;
+
+class WXDLLIMPEXP_CORE wxGraphicsMatrix : public wxGraphicsObject
+{
+public :
+    wxGraphicsMatrix() {}
+
+    virtual ~wxGraphicsMatrix() {}
+
+    // concatenates the matrix
+    virtual void Concat( const wxGraphicsMatrix *t );
+    void Concat( const wxGraphicsMatrix &t ) { Concat( &t ); }
+
+    // sets the matrix to the respective values
+    virtual void Set(wxDouble a=1.0, wxDouble b=0.0, wxDouble c=0.0, wxDouble d=1.0, 
+        wxDouble tx=0.0, wxDouble ty=0.0);
+
+    // gets the component valuess of the matrix
+    virtual void Get(wxDouble* a=NULL, wxDouble* b=NULL,  wxDouble* c=NULL,
+                     wxDouble* d=NULL, wxDouble* tx=NULL, wxDouble* ty=NULL) const;
+       
+    // makes this the inverse matrix
+    virtual void Invert();
+
+    // returns true if the elements of the transformation matrix are equal ?
+    virtual bool IsEqual( const wxGraphicsMatrix* t) const;
+    bool IsEqual( const wxGraphicsMatrix& t) const { return IsEqual( &t ); }
+
+    // return true if this is the identity matrix
+    virtual bool IsIdentity() const;
+
+    //
+    // transformation
+    //
+
+    // add the translation to this matrix
+    virtual void Translate( wxDouble dx , wxDouble dy );
+
+    // add the scale to this matrix
+    virtual void Scale( wxDouble xScale , wxDouble yScale );
+
+    // add the rotation to this matrix (radians)
+    virtual void Rotate( wxDouble angle );  
+
+    //
+    // apply the transforms
+    //
+
+    // applies that matrix to the point
+    virtual void TransformPoint( wxDouble *x, wxDouble *y ) const;
+
+    // applies the matrix except for translations
+    virtual void TransformDistance( wxDouble *dx, wxDouble *dy ) const;
+
+    // returns the native representation
+    virtual void * GetNativeMatrix() const;
+
+    const wxGraphicsMatrixData* GetMatrixData() const 
+    { return (const wxGraphicsMatrixData*) GetRefData(); }
+    wxGraphicsMatrixData* GetMatrixData() 
+    { return (wxGraphicsMatrixData*) GetRefData(); }
+
+private :
+    DECLARE_DYNAMIC_CLASS(wxGraphicsMatrix)
+} ;
+
+extern WXDLLEXPORT_DATA(wxGraphicsMatrix) wxNullGraphicsMatrix;
+
+class WXDLLIMPEXP_CORE wxGraphicsPathData : public wxGraphicsObjectRefData
+{
+public :
+    wxGraphicsPathData(wxGraphicsRenderer* renderer) : wxGraphicsObjectRefData(renderer) {}
+    virtual ~wxGraphicsPathData() {}
+

     //
     // These are the path primitives from which everything else can be constructed
     //
     //
     // These are the path primitives from which everything else can be constructed
     //


@@ -57,11 +250,14 @@ public :
     // adds a cubic Bezier curve from the current point, using two control points and an end point
     virtual void AddCurveToPoint( wxDouble cx1, wxDouble cy1, wxDouble cx2, wxDouble cy2, wxDouble x, wxDouble y ) = 0;
 
     // adds a cubic Bezier curve from the current point, using two control points and an end point
     virtual void AddCurveToPoint( wxDouble cx1, wxDouble cy1, wxDouble cx2, wxDouble cy2, wxDouble x, wxDouble y ) = 0;
 

+    // adds another path
+    virtual void AddPath( const wxGraphicsPathData* path ) =0;
+

     // closes the current sub-path
     virtual void CloseSubpath() = 0;
 
     // gets the last point of the current path, (0,0) if not yet set
     // closes the current sub-path
     virtual void CloseSubpath() = 0;
 
     // gets the last point of the current path, (0,0) if not yet set

-    virtual void GetCurrentPoint( wxDouble& x, wxDouble&y) = 0;
+    virtual void GetCurrentPoint( wxDouble* x, wxDouble* y) const = 0;

 
     // adds an arc of a circle centering at (x,y) with radius (r) from startAngle to endAngle
     virtual void AddArc( wxDouble x, wxDouble y, wxDouble r, wxDouble startAngle, wxDouble endAngle, bool clockwise ) = 0;
 
     // adds an arc of a circle centering at (x,y) with radius (r) from startAngle to endAngle
     virtual void AddArc( wxDouble x, wxDouble y, wxDouble r, wxDouble startAngle, wxDouble endAngle, bool clockwise ) = 0;


@@ -80,46 +276,187 @@ public :
     // appends an ellipsis as a new closed subpath fitting the passed rectangle
     virtual void AddCircle( wxDouble x, wxDouble y, wxDouble r );
 
     // appends an ellipsis as a new closed subpath fitting the passed rectangle
     virtual void AddCircle( wxDouble x, wxDouble y, wxDouble r );
 

-    // draws a an arc to two tangents connecting (current) to (x1,y1) and (x1,y1) to (x2,y2), also a straight line from (current) to (x1,y1)
+    // appends a an arc to two tangents connecting (current) to (x1,y1) and (x1,y1) to (x2,y2), also a straight line from (current) to (x1,y1)

     virtual void AddArcToPoint( wxDouble x1, wxDouble y1 , wxDouble x2, wxDouble y2, wxDouble r ) ;
 
     virtual void AddArcToPoint( wxDouble x1, wxDouble y1 , wxDouble x2, wxDouble y2, wxDouble r ) ;
 

-    // wrappers using wxPoint2DDoubles
+    // appends an ellipse
+    virtual void AddEllipse( wxDouble x, wxDouble y, wxDouble w, wxDouble h);

 
 

-    wxPoint2DDouble GetCurrentPoint();
+    // appends a rounded rectangle
+    virtual void AddRoundedRectangle( wxDouble x, wxDouble y, wxDouble w, wxDouble h, wxDouble radius);
+
+    // returns the native path
+    virtual void * GetNativePath() const = 0;
+
+    // give the native path returned by GetNativePath() back (there might be some deallocations necessary)
+    virtual void UnGetNativePath(void *p) const= 0;
+
+    // transforms each point of this path by the matrix
+    virtual void Transform( const wxGraphicsMatrixData* matrix ) =0;
+
+    // gets the bounding box enclosing all points (possibly including control points)
+    virtual void GetBox(wxDouble *x, wxDouble *y, wxDouble *w, wxDouble *h) const=0;
+
+    virtual bool Contains( wxDouble x, wxDouble y, int fillStyle = wxODDEVEN_RULE) const=0;
+};

 
 

+class WXDLLIMPEXP_CORE wxGraphicsPath : public wxGraphicsObject
+{
+public :
+    wxGraphicsPath()  {}
+    virtual ~wxGraphicsPath() {}
+    
+    //
+    // These are the path primitives from which everything else can be constructed
+    //
+
+    // begins a new subpath at (x,y)
+    virtual void MoveToPoint( wxDouble x, wxDouble y );

     void MoveToPoint( const wxPoint2DDouble& p);
 
     void MoveToPoint( const wxPoint2DDouble& p);
 

+    // adds a straight line from the current point to (x,y) 
+    virtual void AddLineToPoint( wxDouble x, wxDouble y );

     void AddLineToPoint( const wxPoint2DDouble& p);
 
     void AddLineToPoint( const wxPoint2DDouble& p);
 

+    // adds a cubic Bezier curve from the current point, using two control points and an end point
+    virtual void AddCurveToPoint( wxDouble cx1, wxDouble cy1, wxDouble cx2, wxDouble cy2, wxDouble x, wxDouble y ) ;

     void AddCurveToPoint( const wxPoint2DDouble& c1, const wxPoint2DDouble& c2, const wxPoint2DDouble& e);
     void AddCurveToPoint( const wxPoint2DDouble& c1, const wxPoint2DDouble& c2, const wxPoint2DDouble& e);

+    
+    // adds another path
+    virtual void AddPath( const wxGraphicsPath& path );
+
+    // closes the current sub-path
+    virtual void CloseSubpath() ;
+
+    // gets the last point of the current path, (0,0) if not yet set
+    virtual void GetCurrentPoint( wxDouble* x, wxDouble* y) const;
+    wxPoint2DDouble GetCurrentPoint() const;

 
 

+    // adds an arc of a circle centering at (x,y) with radius (r) from startAngle to endAngle
+    virtual void AddArc( wxDouble x, wxDouble y, wxDouble r, wxDouble startAngle, wxDouble endAngle, bool clockwise ) ;

     void AddArc( const wxPoint2DDouble& c, wxDouble r, wxDouble startAngle, wxDouble endAngle, bool clockwise);
 
     void AddArc( const wxPoint2DDouble& c, wxDouble r, wxDouble startAngle, wxDouble endAngle, bool clockwise);
 

-    DECLARE_NO_COPY_CLASS(wxGraphicsPath)
-};
+    //
+    // These are convenience functions which - if not available natively will be assembled 
+    // using the primitives from above
+    //
+
+    // adds a quadratic Bezier curve from the current point, using a control point and an end point
+    virtual void AddQuadCurveToPoint( wxDouble cx, wxDouble cy, wxDouble x, wxDouble y );
+
+    // appends a rectangle as a new closed subpath 
+    virtual void AddRectangle( wxDouble x, wxDouble y, wxDouble w, wxDouble h );
+
+    // appends an ellipsis as a new closed subpath fitting the passed rectangle
+    virtual void AddCircle( wxDouble x, wxDouble y, wxDouble r );
+
+    // appends a an arc to two tangents connecting (current) to (x1,y1) and (x1,y1) to (x2,y2), also a straight line from (current) to (x1,y1)
+    virtual void AddArcToPoint( wxDouble x1, wxDouble y1 , wxDouble x2, wxDouble y2, wxDouble r ) ;
+    
+    // appends an ellipse
+    virtual void AddEllipse( wxDouble x, wxDouble y, wxDouble w, wxDouble h);
+
+    // appends a rounded rectangle
+    virtual void AddRoundedRectangle( wxDouble x, wxDouble y, wxDouble w, wxDouble h, wxDouble radius);

 
 

-class WXDLLEXPORT wxGraphicsContext
+    // returns the native path
+    virtual void * GetNativePath() const;
+    
+    // give the native path returned by GetNativePath() back (there might be some deallocations necessary)
+    virtual void UnGetNativePath(void *p)const;
+    
+    // transforms each point of this path by the matrix
+    virtual void Transform( const wxGraphicsMatrix& matrix );
+    
+    // gets the bounding box enclosing all points (possibly including control points)
+    virtual void GetBox(wxDouble *x, wxDouble *y, wxDouble *w, wxDouble *h)const;
+    wxRect2DDouble GetBox()const;
+    
+    virtual bool Contains( wxDouble x, wxDouble y, int fillStyle = wxODDEVEN_RULE)const;
+    bool Contains( const wxPoint2DDouble& c, int fillStyle = wxODDEVEN_RULE)const;
+    
+    const wxGraphicsPathData* GetPathData() const 
+    { return (const wxGraphicsPathData*) GetRefData(); }
+    wxGraphicsPathData* GetPathData() 
+    { return (wxGraphicsPathData*) GetRefData(); }
+
+private :
+    DECLARE_DYNAMIC_CLASS(wxGraphicsPath)
+} ;
+
+extern WXDLLEXPORT_DATA(wxGraphicsPath) wxNullGraphicsPath;
+
+
+class WXDLLIMPEXP_CORE wxGraphicsContext : public wxGraphicsObject

 {
 public:
 {
 public:

-    wxGraphicsContext() {}
-    virtual ~wxGraphicsContext() {}
+    wxGraphicsContext(wxGraphicsRenderer* renderer);
+
+    virtual ~wxGraphicsContext();

     
     static wxGraphicsContext* Create( const wxWindowDC& dc) ;
     
     static wxGraphicsContext* Create( const wxWindowDC& dc) ;

+    
+#ifdef __WXMSW__
+    static wxGraphicsContext * Create( const wxMemoryDC& dc) ;
+#endif    
+
+    static wxGraphicsContext* CreateFromNative( void * context ) ;

 
 

-    // creates a path instance that corresponds to the type of graphics context, ie GDIPlus, cairo, CoreGraphics ...
-    virtual wxGraphicsPath * CreatePath() = 0;
+    static wxGraphicsContext* CreateFromNativeWindow( void * window ) ;

 
 

+    static wxGraphicsContext* Create( wxWindow* window ) ;
+
+    // create a context that can be used for measuring texts only, no drawing allowed
+    static wxGraphicsContext * Create();
+
+    wxGraphicsPath CreatePath() const;
+    
+    virtual wxGraphicsPen CreatePen(const wxPen& pen) const;
+    
+    virtual wxGraphicsBrush CreateBrush(const wxBrush& brush ) const;
+    
+    // sets the brush to a linear gradient, starting at (x1,y1) with color c1 to (x2,y2) with color c2
+    virtual wxGraphicsBrush CreateLinearGradientBrush( wxDouble x1, wxDouble y1, wxDouble x2, wxDouble y2, 
+        const wxColour&c1, const wxColour&c2) const;
+
+    // sets the brush to a radial gradient originating at (xo,yc) with color oColor and ends on a circle around (xc,yc) 
+    // with radius r and color cColor
+    virtual wxGraphicsBrush CreateRadialGradientBrush( wxDouble xo, wxDouble yo, wxDouble xc, wxDouble yc, wxDouble radius,
+        const wxColour &oColor, const wxColour &cColor) const;
+
+    // sets the font
+    virtual wxGraphicsFont CreateFont( const wxFont &font , const wxColour &col = *wxBLACK ) const;
+
+    // create a 'native' matrix corresponding to these values
+    virtual wxGraphicsMatrix CreateMatrix( wxDouble a=1.0, wxDouble b=0.0, wxDouble c=0.0, wxDouble d=1.0, 
+        wxDouble tx=0.0, wxDouble ty=0.0) const;
+    

     // push the current state of the context, ie the transformation matrix on a stack
     virtual void PushState() = 0;
 
     // pops a stored state from the stack
     virtual void PopState() = 0;
 
     // push the current state of the context, ie the transformation matrix on a stack
     virtual void PushState() = 0;
 
     // pops a stored state from the stack
     virtual void PopState() = 0;
 

-    // clips drawings to the region
+    // clips drawings to the region, combined to current clipping region

     virtual void Clip( const wxRegion &region ) = 0;
 
     virtual void Clip( const wxRegion &region ) = 0;
 

+    // clips drawings to the rect
+    virtual void Clip( wxDouble x, wxDouble y, wxDouble w, wxDouble h ) = 0;
+    
+    // resets the clipping to original extent
+    virtual void ResetClip() = 0 ;
+
+    // returns the native context
+    virtual void * GetNativeContext() = 0;
+
+    // returns the current logical function
+    virtual int GetLogicalFunction() const { return m_logicalFunction; }
+    
+    // sets the current logical function, returns true if it supported
+    virtual bool SetLogicalFunction(int function) ;
+

     //
     //

-    // transformation
+    // transformation : changes the current transformation matrix CTM of the context

     //
     
     // translate
     //
     
     // translate


@@ -130,41 +467,44 @@ public:
 
     // rotate (radians)
     virtual void Rotate( wxDouble angle ) = 0;
 
     // rotate (radians)
     virtual void Rotate( wxDouble angle ) = 0;

+    
+    // concatenates this transform with the current transform of this context
+    virtual void ConcatTransform( const wxGraphicsMatrix& matrix ) = 0;
+
+    // sets the transform of this context
+    virtual void SetTransform( const wxGraphicsMatrix& matrix ) = 0;

 
 

+    // gets the matrix of this context
+    virtual wxGraphicsMatrix GetTransform() const = 0;

     //
     // setting the paint
     //
     
     //
     // setting the paint
     //
     

-    // sets the pan
-    virtual void SetPen( const wxPen &pen ) = 0;
+    // sets the pen
+    virtual void SetPen( const wxGraphicsPen& pen );
+    
+    void SetPen( const wxPen& pen );

 
     // sets the brush for filling
 
     // sets the brush for filling

-    virtual void SetBrush( const wxBrush &brush ) = 0;
-
-    // sets the brush to a linear gradient, starting at (x1,y1) with color c1 to (x2,y2) with color c2
-    virtual void SetLinearGradientBrush( wxDouble x1, wxDouble y1, wxDouble x2, wxDouble y2, 
-        const wxColour&c1, const wxColour&c2) = 0;
-
-    // sets the brush to a radial gradient originating at (xo,yc) with color oColor and ends on a circle around (xc,yc) 
-    // with radius r and color cColor
-    virtual void SetRadialGradientBrush( wxDouble xo, wxDouble yo, wxDouble xc, wxDouble yc, wxDouble radius,
-        const wxColour &oColor, const wxColour &cColor) = 0;
+    virtual void SetBrush( const wxGraphicsBrush& brush );
+    
+    void SetBrush( const wxBrush& brush );

 
     // sets the font
 
     // sets the font

-    virtual void SetFont( const wxFont &font ) = 0;
+    virtual void SetFont( const wxGraphicsFont& font );

     
     

-    // sets the text color
-    virtual void SetTextColor( const wxColour &col ) = 0;
+    void SetFont( const wxFont& font, const wxColour& colour );

 
 

+    

     // strokes along a path with the current pen
     // strokes along a path with the current pen

-    virtual void StrokePath( const wxGraphicsPath *path ) = 0;
+    virtual void StrokePath( const wxGraphicsPath& path ) = 0;

 
     // fills a path with the current brush
 
     // fills a path with the current brush

-    virtual void FillPath( const wxGraphicsPath *path, int fillStyle = wxWINDING_RULE ) = 0;
+    virtual void FillPath( const wxGraphicsPath& path, int fillStyle = wxODDEVEN_RULE ) = 0;

 
     // draws a path by first filling and then stroking
 
     // draws a path by first filling and then stroking

-    virtual void DrawPath( const wxGraphicsPath *path, int fillStyle = wxWINDING_RULE );
-
+    virtual void DrawPath( const wxGraphicsPath& path, int fillStyle = wxODDEVEN_RULE );
+    

     //
     // text
     //
     //
     // text
     //


@@ -173,6 +513,10 @@ public:
 
     virtual void DrawText( const wxString &str, wxDouble x, wxDouble y, wxDouble angle );
 
 
     virtual void DrawText( const wxString &str, wxDouble x, wxDouble y, wxDouble angle );
 

+    virtual void DrawText( const wxString &str, wxDouble x, wxDouble y, const wxGraphicsBrush& backgroundBrush ) ;
+
+    virtual void DrawText( const wxString &str, wxDouble x, wxDouble y, wxDouble angle, const wxGraphicsBrush& backgroundBrush );
+

     virtual void GetTextExtent( const wxString &text, wxDouble *width, wxDouble *height,
         wxDouble *descent, wxDouble *externalLeading ) const  = 0;
 
     virtual void GetTextExtent( const wxString &text, wxDouble *width, wxDouble *height,
         wxDouble *descent, wxDouble *externalLeading ) const  = 0;
 


@@ -200,7 +544,7 @@ public:
     virtual void StrokeLines( size_t n, const wxPoint2DDouble *beginPoints, const wxPoint2DDouble *endPoints);
 
     // draws a polygon
     virtual void StrokeLines( size_t n, const wxPoint2DDouble *beginPoints, const wxPoint2DDouble *endPoints);
 
     // draws a polygon

-    virtual void DrawLines( size_t n, const wxPoint2DDouble *points, int fillStyle = wxWINDING_RULE );
+    virtual void DrawLines( size_t n, const wxPoint2DDouble *points, int fillStyle = wxODDEVEN_RULE );

 
     // draws a polygon
     virtual void DrawRectangle( wxDouble x, wxDouble y, wxDouble w, wxDouble h);
 
     // draws a polygon
     virtual void DrawRectangle( wxDouble x, wxDouble y, wxDouble w, wxDouble h);


@@ -213,152 +557,118 @@ public:
 
      // wrappers using wxPoint2DDouble TODO
 
 
      // wrappers using wxPoint2DDouble TODO
 

-    DECLARE_NO_COPY_CLASS(wxGraphicsContext)
-};
-
-class WXDLLEXPORT wxGCDC: public wxDC
-{
-    DECLARE_DYNAMIC_CLASS(wxGCDC)
-    DECLARE_NO_COPY_CLASS(wxGCDC)
-
-public:
-    wxGCDC(const wxWindowDC& dc);
-    wxGCDC();
-    virtual ~wxGCDC();
-
-    void Init();
-
-
-    // implement base class pure virtuals
-    // ----------------------------------
-
-    virtual void Clear();
-
-    virtual bool StartDoc( const wxString& WXUNUSED(message) ) { return true; }
-    virtual void EndDoc(void) {}
-
-    virtual void StartPage(void) {}
-    virtual void EndPage(void) {}
-
-    virtual void SetFont(const wxFont& font);
-    virtual void SetPen(const wxPen& pen);
-    virtual void SetBrush(const wxBrush& brush);
-    virtual void SetBackground(const wxBrush& brush);
-    virtual void SetBackgroundMode(int mode);
-    virtual void SetPalette(const wxPalette& palette);
-
-    virtual void DestroyClippingRegion();
-
-    virtual wxCoord GetCharHeight() const;
-    virtual wxCoord GetCharWidth() const;
-
-    virtual bool CanDrawBitmap() const;
-    virtual bool CanGetTextExtent() const;
-    virtual int GetDepth() const;
-    virtual wxSize GetPPI() const;
-
-    virtual void SetMapMode(int mode);
-    virtual void SetUserScale(double x, double y);
-
-    virtual void SetLogicalScale(double x, double y);
-    virtual void SetLogicalOrigin(wxCoord x, wxCoord y);
-    virtual void SetDeviceOrigin(wxCoord x, wxCoord y);
-    virtual void SetAxisOrientation(bool xLeftRight, bool yBottomUp);
-    virtual void SetLogicalFunction(int function);
-
-    virtual void SetTextForeground(const wxColour& colour);
-    virtual void SetTextBackground(const wxColour& colour);
-
-    virtual void ComputeScaleAndOrigin();
-
-    wxGraphicsContext* GetGraphicContext() { return m_graphicContext; }
-
-protected:
-    // the true implementations
-    virtual bool DoFloodFill(wxCoord x, wxCoord y, const wxColour& col,
-        int style = wxFLOOD_SURFACE);
-
-    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);
+    // helper to determine if a 0.5 offset should be applied for the drawing operation
+    virtual bool ShouldOffset() const { return false; }

 
 

-    virtual bool DoGetPixel(wxCoord x, wxCoord y, wxColour *col) const;
+protected :

 
 

-    virtual void DoDrawPoint(wxCoord x, wxCoord y);
+    wxGraphicsPen m_pen;
+    wxGraphicsBrush m_brush;
+    wxGraphicsFont m_font;
+    int m_logicalFunction;

 
 

-#if wxUSE_SPLINES
-    virtual void DoDrawSpline(wxList *points);
-#endif
+private :
+    DECLARE_NO_COPY_CLASS(wxGraphicsContext)
+    DECLARE_ABSTRACT_CLASS(wxGraphicsContext)
+};

 
 

-    virtual void DoDrawLine(wxCoord x1, wxCoord y1, wxCoord x2, wxCoord y2);
+#if 0 

 
 

-    virtual void DoDrawArc(wxCoord x1, wxCoord y1,
-        wxCoord x2, wxCoord y2,
-        wxCoord xc, wxCoord yc);
+//
+// A graphics figure allows to cache path, pen etc creations, also will be a basis for layering/grouping elements
+//

 
 

-    virtual void DoDrawCheckMark(wxCoord x, wxCoord y,
-        wxCoord width, wxCoord height);
+class WXDLLIMPEXP_CORE wxGraphicsFigure : public wxGraphicsObject
+{
+public :
+    wxGraphicsFigure(wxGraphicsRenderer* renderer) ;
+        
+    virtual ~wxGraphicsFigure() ;
+    
+    void SetPath( wxGraphicsMatrix* matrix );
+    
+    void SetMatrix( wxGraphicsPath* path);

 
 

-    virtual void DoDrawEllipticArc(wxCoord x, wxCoord y, wxCoord w, wxCoord h,
-        double sa, double ea);
+    // draws this object on the context
+    virtual void Draw( wxGraphicsContext* cg );
+    
+    // returns the path of this object
+    wxGraphicsPath* GetPath() { return m_path; }
+    
+    // returns the transformation matrix of this object, may be null if there is no transformation necessary
+    wxGraphicsMatrix* GetMatrix() { return m_matrix; }
+    
+private :
+    wxGraphicsMatrix* m_matrix;
+    wxGraphicsPath* m_path;
+    
+    DECLARE_DYNAMIC_CLASS(wxGraphicsFigure)
+} ;
+  
+#endif  
+
+//
+// The graphics renderer is the instance corresponding to the rendering engine used, eg there is ONE core graphics renderer
+// instance on OSX. This instance is pointed back to by all objects created by it. Therefore you can create eg additional
+// paths at any point from a given matrix etc.
+//
+
+class WXDLLIMPEXP_CORE wxGraphicsRenderer : public wxObject
+{
+public :
+    wxGraphicsRenderer() {}

 
 

-    virtual void DoDrawRectangle(wxCoord x, wxCoord y, wxCoord width, wxCoord height);
-    virtual void DoDrawRoundedRectangle(wxCoord x, wxCoord y,
-        wxCoord width, wxCoord height,
-        double radius);
-    virtual void DoDrawEllipse(wxCoord x, wxCoord y, wxCoord width, wxCoord height);
+    virtual ~wxGraphicsRenderer() {}

 
 

-    virtual void DoCrossHair(wxCoord x, wxCoord y);
+    static wxGraphicsRenderer* GetDefaultRenderer();

 
 

-    virtual void DoDrawIcon(const wxIcon& icon, wxCoord x, wxCoord y);
-    virtual void DoDrawBitmap(const wxBitmap &bmp, wxCoord x, wxCoord y,
-        bool useMask = false);
+    // Context

 
 

-    virtual void DoDrawText(const wxString& text, wxCoord x, wxCoord y);
-    virtual void DoDrawRotatedText(const wxString& text, wxCoord x, wxCoord y,
-        double angle);
+    virtual wxGraphicsContext * CreateContext( const wxWindowDC& dc) = 0 ;
+#ifdef __WXMSW__
+    virtual wxGraphicsContext * CreateContext( const wxMemoryDC& dc) = 0 ;
+#endif    
+    virtual wxGraphicsContext * CreateContextFromNativeContext( void * context ) = 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 = -1, wxCoord ysrcMask = -1);
+    virtual wxGraphicsContext * CreateContextFromNativeWindow( void * window ) = 0;

 
 

-    virtual void DoGetSize(int *,int *) const;
-    virtual void DoGetSizeMM(int* width, int* height) const;
+    virtual wxGraphicsContext * CreateContext( wxWindow* window ) = 0;

 
 

-    virtual void DoDrawLines(int n, wxPoint points[],
-        wxCoord xoffset, wxCoord yoffset);
-    virtual void DoDrawPolygon(int n, wxPoint points[],
-        wxCoord xoffset, wxCoord yoffset,
-        int fillStyle = wxODDEVEN_RULE);
-    virtual void DoDrawPolyPolygon(int n, int count[], wxPoint points[],
-        wxCoord xoffset, wxCoord yoffset,
-        int fillStyle);
+    // create a context that can be used for measuring texts only, no drawing allowed
+    virtual wxGraphicsContext * CreateMeasuringContext() = 0;

 
 

-    virtual void DoSetClippingRegionAsRegion(const wxRegion& region);
-    virtual void DoSetClippingRegion(wxCoord x, wxCoord y,
-        wxCoord width, wxCoord height);
+    // Path
+    
+    virtual wxGraphicsPath CreatePath() = 0;

 
 

-    virtual void DoGetTextExtent(const wxString& string,
-        wxCoord *x, wxCoord *y,
-        wxCoord *descent = NULL,
-        wxCoord *externalLeading = NULL,
-        wxFont *theFont = NULL) const;
+    // Matrix
+    
+    virtual wxGraphicsMatrix CreateMatrix( wxDouble a=1.0, wxDouble b=0.0, wxDouble c=0.0, wxDouble d=1.0, 
+        wxDouble tx=0.0, wxDouble ty=0.0) = 0;
+        
+    // Paints
+    
+    virtual wxGraphicsPen CreatePen(const wxPen& pen) = 0 ;
+    
+    virtual wxGraphicsBrush CreateBrush(const wxBrush& brush ) = 0 ;
+    
+    // sets the brush to a linear gradient, starting at (x1,y1) with color c1 to (x2,y2) with color c2
+    virtual wxGraphicsBrush CreateLinearGradientBrush( wxDouble x1, wxDouble y1, wxDouble x2, wxDouble y2, 
+        const wxColour&c1, const wxColour&c2) = 0;

 
 

-    virtual bool DoGetPartialTextExtents(const wxString& text, wxArrayInt& widths) const;
+    // sets the brush to a radial gradient originating at (xo,yc) with color oColor and ends on a circle around (xc,yc) 
+    // with radius r and color cColor
+    virtual wxGraphicsBrush CreateRadialGradientBrush( wxDouble xo, wxDouble yo, wxDouble xc, wxDouble yc, wxDouble radius,
+        const wxColour &oColor, const wxColour &cColor) = 0;

 
 

-protected:
-    // scaling variables
-    double       m_mm_to_pix_x, m_mm_to_pix_y;
+   // sets the font
+    virtual wxGraphicsFont CreateFont( const wxFont &font , const wxColour &col = *wxBLACK ) = 0;
+    
+private :
+    DECLARE_NO_COPY_CLASS(wxGraphicsRenderer)
+    DECLARE_ABSTRACT_CLASS(wxGraphicsRenderer)
+} ;

 
 

-    wxGraphicsContext* m_graphicContext;
-};

 #endif
 
 #endif
 

-#endif
-    // _WX_GRID_H_BASE_
+#endif // _WX_GRAPHICS_H_