X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/1c69a6ff5a4ce2e35997b2e683462f565a451f23..558820fd083635d3e1dc026a56b2f14870cb5c38:/include/wx/graphics.h diff --git a/include/wx/graphics.h b/include/wx/graphics.h old mode 100755 new mode 100644 index be2397da23..e710213c94 --- a/include/wx/graphics.h +++ b/include/wx/graphics.h @@ -17,15 +17,16 @@ #include "wx/geometry.h" #include "wx/dynarray.h" -class WXDLLIMPEXP_CORE wxWindowDC; -class WXDLLIMPEXP_CORE wxGraphicsContext; -class WXDLLIMPEXP_CORE wxGraphicsPath; -class WXDLLIMPEXP_CORE wxGraphicsMatrix; -class WXDLLIMPEXP_CORE wxGraphicsFigure; -class WXDLLIMPEXP_CORE wxGraphicsRenderer; -class WXDLLIMPEXP_CORE wxGraphicsPen; -class WXDLLIMPEXP_CORE wxGraphicsBrush; -class WXDLLIMPEXP_CORE wxGraphicsFont; +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 @@ -37,63 +38,204 @@ class WXDLLIMPEXP_CORE wxGraphicsFont; // 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 : + 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( wxGraphicsRenderer* renderer = NULL ) : m_renderer(renderer) {} - - wxGraphicsObject( const wxGraphicsObject& obj ) : m_renderer(obj.GetRenderer()) {} - - virtual ~wxGraphicsObject() {} - - wxGraphicsRenderer* GetRenderer() const { return m_renderer ; } + 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 : - wxGraphicsRenderer* m_renderer; - DECLARE_DYNAMIC_CLASS(wxGraphicsObject); + virtual wxObjectRefData* CreateRefData() const; + virtual wxObjectRefData* CloneRefData(const wxObjectRefData* data) const; + + DECLARE_DYNAMIC_CLASS(wxGraphicsObject) } ; class WXDLLIMPEXP_CORE wxGraphicsPen : public wxGraphicsObject { public : - wxGraphicsPen(wxGraphicsRenderer* renderer) : wxGraphicsObject(renderer) {} + wxGraphicsPen() {} virtual ~wxGraphicsPen() {} - virtual void Apply( wxGraphicsContext* context) = 0; - virtual wxDouble GetWidth() = 0; private : - DECLARE_NO_COPY_CLASS(wxGraphicsPen) - DECLARE_ABSTRACT_CLASS(wxGraphicsPen) + DECLARE_DYNAMIC_CLASS(wxGraphicsPen) } ; +extern WXDLLEXPORT_DATA(wxGraphicsPen) wxNullGraphicsPen; + class WXDLLIMPEXP_CORE wxGraphicsBrush : public wxGraphicsObject { public : - wxGraphicsBrush(wxGraphicsRenderer* renderer) : wxGraphicsObject(renderer) {} + wxGraphicsBrush() {} virtual ~wxGraphicsBrush() {} - virtual void Apply( wxGraphicsContext* context) = 0; private : - DECLARE_NO_COPY_CLASS(wxGraphicsBrush) - DECLARE_ABSTRACT_CLASS(wxGraphicsBrush) + DECLARE_DYNAMIC_CLASS(wxGraphicsBrush) } ; +extern WXDLLEXPORT_DATA(wxGraphicsBrush) wxNullGraphicsBrush; + class WXDLLIMPEXP_CORE wxGraphicsFont : public wxGraphicsObject { public : - wxGraphicsFont(wxGraphicsRenderer* renderer) : wxGraphicsObject(renderer) {} + wxGraphicsFont() {} virtual ~wxGraphicsFont() {} - virtual void Apply( wxGraphicsContext* context) = 0; private : - DECLARE_NO_COPY_CLASS(wxGraphicsFont) - DECLARE_ABSTRACT_CLASS(wxGraphicsFont) + DECLARE_DYNAMIC_CLASS(wxGraphicsFont) } ; -class WXDLLIMPEXP_CORE wxGraphicsPath : public wxGraphicsObject +extern WXDLLEXPORT_DATA(wxGraphicsFont) wxNullGraphicsFont; + + +class WXDLLIMPEXP_CORE wxGraphicsMatrixData : public wxGraphicsObjectRefData { public : - wxGraphicsPath(wxGraphicsRenderer* renderer) : wxGraphicsObject(renderer) {} - virtual ~wxGraphicsPath() {} - - virtual wxGraphicsPath *Clone() const = 0; + 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 @@ -101,29 +243,24 @@ public : // begins a new subpath at (x,y) virtual void MoveToPoint( wxDouble x, wxDouble y ) = 0; - void MoveToPoint( const wxPoint2DDouble& p); // adds a straight line from the current point to (x,y) virtual void AddLineToPoint( wxDouble x, wxDouble y ) = 0; - 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 ) = 0; - void AddCurveToPoint( const wxPoint2DDouble& c1, const wxPoint2DDouble& c2, const wxPoint2DDouble& e); - - // adds another path - virtual void AddPath( const wxGraphicsPath* path ) =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 - virtual void GetCurrentPoint( wxDouble& x, wxDouble&y) = 0; - wxPoint2DDouble GetCurrentPoint(); + 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; - void AddArc( const wxPoint2DDouble& c, wxDouble r, wxDouble startAngle, wxDouble endAngle, bool clockwise); // // These are convenience functions which - if not available natively will be assembled @@ -139,90 +276,117 @@ public : // 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 ) ; - - // 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) = 0; - - // transforms each point of this path by the matrix - virtual void Transform( wxGraphicsMatrix* matrix ) =0; - - // gets the bounding box enclosing all points (possibly including control points) - virtual void GetBox(wxDouble *x, wxDouble *y, wxDouble *w, wxDouble *h) =0; - wxRect2DDouble GetBox(); - - virtual bool Contains( wxDouble x, wxDouble y, int fillStyle = wxWINDING_RULE) =0; - bool Contains( const wxPoint2DDouble& c, int fillStyle = wxWINDING_RULE); - - DECLARE_NO_COPY_CLASS(wxGraphicsPath) - DECLARE_ABSTRACT_CLASS(wxGraphicsPath) + + // 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); + + // 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 wxGraphicsMatrix : public wxGraphicsObject +class WXDLLIMPEXP_CORE wxGraphicsPath : public wxGraphicsObject { public : - wxGraphicsMatrix(wxGraphicsRenderer* renderer) : wxGraphicsObject(renderer) {} - - virtual ~wxGraphicsMatrix() {} - - virtual wxGraphicsMatrix *Clone() const = 0; - - // concatenates the matrix - virtual void Concat( const wxGraphicsMatrix *t ) = 0; - void Concat( const wxGraphicsMatrix &t ) { Concat( &t ); } - - // copies the passed in matrix - virtual void Copy( const wxGraphicsMatrix *t ) = 0; - void Copy( const wxGraphicsMatrix &t ) { Copy( &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) = 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 wxGraphicsMatrix* t) const = 0; - bool IsEqual( const wxGraphicsMatrix& t) const { return IsEqual( &t ); } - - // return true if this is the identity matrix - virtual bool IsIdentity() = 0; - + wxGraphicsPath() {} + virtual ~wxGraphicsPath() {} + // - // transformation + // 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); + + // adds a straight line from the current point to (x,y) + virtual void AddLineToPoint( wxDouble x, wxDouble y ); + 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); - // add the translation to this matrix - virtual void Translate( wxDouble dx , wxDouble dy ) = 0; + // adds another path + virtual void AddPath( const wxGraphicsPath& path ); - // add the scale to this matrix - virtual void Scale( wxDouble xScale , wxDouble yScale ) = 0; + // 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); - // add the rotation to this matrix (radians) - virtual void Rotate( wxDouble angle ) = 0; - // - // apply the transforms + // These are convenience functions which - if not available natively will be assembled + // using the primitives from above // - - // applies that matrix to the point - virtual void TransformPoint( wxDouble *x, wxDouble *y ) = 0; - - // applies the matrix except for translations - virtual void TransformDistance( wxDouble *dx, wxDouble *dy ) =0; - - // returns the native representation - virtual void * GetNativeMatrix() const = 0; - - DECLARE_NO_COPY_CLASS(wxGraphicsMatrix) - DECLARE_ABSTRACT_CLASS(wxGraphicsMatrix) + + // 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); + + // 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: @@ -231,36 +395,42 @@ public: virtual ~wxGraphicsContext(); static wxGraphicsContext* Create( const wxWindowDC& dc) ; - + +#ifdef __WXMSW__ + static wxGraphicsContext * Create( const wxMemoryDC& dc) ; +#endif + static wxGraphicsContext* CreateFromNative( void * context ) ; -#ifdef __WXMAC__ static wxGraphicsContext* CreateFromNativeWindow( void * window ) ; -#endif + static wxGraphicsContext* Create( wxWindow* window ) ; - wxGraphicsPath * CreatePath(); - - virtual wxGraphicsPen* CreatePen(const wxPen& pen); + // 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 ); + 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); + 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); + 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 ); + 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); - + // 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; @@ -272,12 +442,18 @@ public: // 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 ; + + // resets the clipping to original extent + virtual void ResetClip() = 0 ; - // returns the native context - virtual void * GetNativeContext() = 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 : changes the current transformation matrix CTM of the context @@ -291,43 +467,44 @@ public: // 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; + + // 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; + // sets the transform of this context + virtual void SetTransform( const wxGraphicsMatrix& matrix ) = 0; - // gets the matrix of this context - virtual void GetTransform( wxGraphicsMatrix* matrix ) = 0; + // gets the matrix of this context + virtual wxGraphicsMatrix GetTransform() const = 0; // // setting the paint // // sets the pen - virtual void SetPen( wxGraphicsPen* pen , bool release = true ); + virtual void SetPen( const wxGraphicsPen& pen ); void SetPen( const wxPen& pen ); // sets the brush for filling - virtual void SetBrush( wxGraphicsBrush* brush , bool release = true ); + virtual void SetBrush( const wxGraphicsBrush& brush ); void SetBrush( const wxBrush& brush ); // sets the font - virtual void SetFont( wxGraphicsFont* font, bool release = true ); + virtual void SetFont( const wxGraphicsFont& font ); void SetFont( const wxFont& font, const wxColour& colour ); + // 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 - 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 - virtual void DrawPath( const wxGraphicsPath *path, int fillStyle = wxWINDING_RULE ); - + virtual void DrawPath( const wxGraphicsPath& path, int fillStyle = wxODDEVEN_RULE ); + // // text // @@ -336,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, 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; @@ -363,7 +544,7 @@ public: 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); @@ -376,16 +557,15 @@ public: // wrappers using wxPoint2DDouble TODO -protected : // helper to determine if a 0.5 offset should be applied for the drawing operation virtual bool ShouldOffset() const { return false; } - wxGraphicsPen* m_pen; - bool m_releasePen; - wxGraphicsBrush* m_brush; - bool m_releaseBrush; - wxGraphicsFont* m_font; - bool m_releaseFont; +protected : + + wxGraphicsPen m_pen; + wxGraphicsBrush m_brush; + wxGraphicsFont m_font; + int m_logicalFunction; private : DECLARE_NO_COPY_CLASS(wxGraphicsContext) @@ -401,26 +581,26 @@ private : class WXDLLIMPEXP_CORE wxGraphicsFigure : public wxGraphicsObject { public : - wxGraphicsFigure(wxGraphicsRenderer* renderer) ; - - virtual ~wxGraphicsFigure() ; - - void SetPath( wxGraphicsMatrix* matrix ); - - void SetMatrix( wxGraphicsPath* path); - - // 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; } - + wxGraphicsFigure(wxGraphicsRenderer* renderer) ; + + virtual ~wxGraphicsFigure() ; + + void SetPath( wxGraphicsMatrix* matrix ); + + void SetMatrix( wxGraphicsPath* path); + + // 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; + wxGraphicsMatrix* m_matrix; + wxGraphicsPath* m_path; DECLARE_DYNAMIC_CLASS(wxGraphicsFigure) } ; @@ -440,47 +620,52 @@ public : virtual ~wxGraphicsRenderer() {} - static wxGraphicsRenderer* GetDefaultRenderer(); + static wxGraphicsRenderer* GetDefaultRenderer(); + + // Context - // Context + virtual wxGraphicsContext * CreateContext( const wxWindowDC& dc) = 0 ; +#ifdef __WXMSW__ + virtual wxGraphicsContext * CreateContext( const wxMemoryDC& dc) = 0 ; +#endif + virtual wxGraphicsContext * CreateContextFromNativeContext( void * context ) = 0; - virtual wxGraphicsContext * CreateContext( const wxWindowDC& dc) = 0 ; - - virtual wxGraphicsContext * CreateContextFromNativeContext( void * context ) = 0; + virtual wxGraphicsContext * CreateContextFromNativeWindow( void * window ) = 0; - virtual wxGraphicsContext * CreateContextFromNativeWindow( void * window ) = 0; + virtual wxGraphicsContext * CreateContext( wxWindow* window ) = 0; - virtual wxGraphicsContext * CreateContext( wxWindow* window ) = 0; + // create a context that can be used for measuring texts only, no drawing allowed + virtual wxGraphicsContext * CreateMeasuringContext() = 0; - // Path - - virtual wxGraphicsPath * CreatePath() = 0; + // Path + + virtual wxGraphicsPath CreatePath() = 0; - // 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; + // 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 wxGraphicsPen CreatePen(const wxPen& pen) = 0 ; - virtual wxGraphicsBrush* CreateBrush(const wxBrush& brush ) = 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, + virtual wxGraphicsBrush CreateLinearGradientBrush( 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 wxGraphicsBrush* CreateRadialGradientBrush( wxDouble xo, wxDouble yo, wxDouble xc, wxDouble yc, wxDouble radius, + virtual wxGraphicsBrush CreateRadialGradientBrush( wxDouble xo, wxDouble yo, wxDouble xc, wxDouble yc, wxDouble radius, const wxColour &oColor, const wxColour &cColor) = 0; // sets the font - virtual wxGraphicsFont* CreateFont( const wxFont &font , const wxColour &col = *wxBLACK ) = 0; + virtual wxGraphicsFont CreateFont( const wxFont &font , const wxColour &col = *wxBLACK ) = 0; private : - DECLARE_NO_COPY_CLASS(wxGraphicsRenderer) + DECLARE_NO_COPY_CLASS(wxGraphicsRenderer) DECLARE_ABSTRACT_CLASS(wxGraphicsRenderer) } ;