removed extra semicolon (bug 1819361)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_8_BRANCH@49402 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -31,12 +31,12 @@ class WXDLLIMPEXP_CORE wxGraphicsFont;
|
|||||||
/*
|
/*
|
||||||
* notes about the graphics context apis
|
* notes about the graphics context apis
|
||||||
*
|
*
|
||||||
* angles : are measured in radians, 0.0 being in direction of positiv x axis, PI/2 being
|
* angles : are measured in radians, 0.0 being in direction of positiv x axis, PI/2 being
|
||||||
* in direction of positive y axis.
|
* in direction of positive y axis.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
// Base class of all objects used for drawing in the new graphics API, the always point back to their
|
// 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,
|
// originating rendering engine, there is no dynamic unloading of a renderer currently allowed,
|
||||||
// these references are not counted
|
// these references are not counted
|
||||||
|
|
||||||
//
|
//
|
||||||
@@ -44,7 +44,7 @@ class WXDLLIMPEXP_CORE wxGraphicsFont;
|
|||||||
// duplication. Any operation on a shared instance that results in a modified state, uncouples this
|
// 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
|
// instance from the other instances that were shared - using copy on write semantics
|
||||||
//
|
//
|
||||||
|
|
||||||
class WXDLLIMPEXP_CORE wxGraphicsObjectRefData : public wxObjectRefData
|
class WXDLLIMPEXP_CORE wxGraphicsObjectRefData : public wxObjectRefData
|
||||||
{
|
{
|
||||||
public :
|
public :
|
||||||
@@ -63,7 +63,7 @@ public :
|
|||||||
wxGraphicsObject() ;
|
wxGraphicsObject() ;
|
||||||
wxGraphicsObject( wxGraphicsRenderer* renderer ) ;
|
wxGraphicsObject( wxGraphicsRenderer* renderer ) ;
|
||||||
virtual ~wxGraphicsObject() ;
|
virtual ~wxGraphicsObject() ;
|
||||||
|
|
||||||
bool IsNull() const ;
|
bool IsNull() const ;
|
||||||
|
|
||||||
// returns the renderer that was used to create this instance, or NULL if it has not been initialized yet
|
// returns the renderer that was used to create this instance, or NULL if it has not been initialized yet
|
||||||
@@ -73,7 +73,7 @@ protected :
|
|||||||
virtual wxObjectRefData* CreateRefData() const;
|
virtual wxObjectRefData* CreateRefData() const;
|
||||||
virtual wxObjectRefData* CloneRefData(const wxObjectRefData* data) const;
|
virtual wxObjectRefData* CloneRefData(const wxObjectRefData* data) const;
|
||||||
|
|
||||||
DECLARE_DYNAMIC_CLASS(wxGraphicsObject);
|
DECLARE_DYNAMIC_CLASS(wxGraphicsObject)
|
||||||
} ;
|
} ;
|
||||||
|
|
||||||
class WXDLLIMPEXP_CORE wxGraphicsPen : public wxGraphicsObject
|
class WXDLLIMPEXP_CORE wxGraphicsPen : public wxGraphicsObject
|
||||||
@@ -113,7 +113,7 @@ extern WXDLLEXPORT_DATA(wxGraphicsFont) wxNullGraphicsFont;
|
|||||||
class WXDLLIMPEXP_CORE wxGraphicsMatrixData : public wxGraphicsObjectRefData
|
class WXDLLIMPEXP_CORE wxGraphicsMatrixData : public wxGraphicsObjectRefData
|
||||||
{
|
{
|
||||||
public :
|
public :
|
||||||
wxGraphicsMatrixData( wxGraphicsRenderer* renderer) :
|
wxGraphicsMatrixData( wxGraphicsRenderer* renderer) :
|
||||||
wxGraphicsObjectRefData(renderer) {}
|
wxGraphicsObjectRefData(renderer) {}
|
||||||
|
|
||||||
virtual ~wxGraphicsMatrixData() {}
|
virtual ~wxGraphicsMatrixData() {}
|
||||||
@@ -122,13 +122,13 @@ public :
|
|||||||
virtual void Concat( const wxGraphicsMatrixData *t ) = 0;
|
virtual void Concat( const wxGraphicsMatrixData *t ) = 0;
|
||||||
|
|
||||||
// sets the matrix to the respective values
|
// 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,
|
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;
|
wxDouble tx=0.0, wxDouble ty=0.0) = 0;
|
||||||
|
|
||||||
// gets the component valuess of the matrix
|
// gets the component valuess of the matrix
|
||||||
virtual void Get(wxDouble* a=NULL, wxDouble* b=NULL, wxDouble* c=NULL,
|
virtual void Get(wxDouble* a=NULL, wxDouble* b=NULL, wxDouble* c=NULL,
|
||||||
wxDouble* d=NULL, wxDouble* tx=NULL, wxDouble* ty=NULL) const = 0;
|
wxDouble* d=NULL, wxDouble* tx=NULL, wxDouble* ty=NULL) const = 0;
|
||||||
|
|
||||||
// makes this the inverse matrix
|
// makes this the inverse matrix
|
||||||
virtual void Invert() = 0;
|
virtual void Invert() = 0;
|
||||||
|
|
||||||
@@ -149,7 +149,7 @@ public :
|
|||||||
virtual void Scale( wxDouble xScale , wxDouble yScale ) = 0;
|
virtual void Scale( wxDouble xScale , wxDouble yScale ) = 0;
|
||||||
|
|
||||||
// add the rotation to this matrix (radians)
|
// add the rotation to this matrix (radians)
|
||||||
virtual void Rotate( wxDouble angle ) = 0;
|
virtual void Rotate( wxDouble angle ) = 0;
|
||||||
|
|
||||||
//
|
//
|
||||||
// apply the transforms
|
// apply the transforms
|
||||||
@@ -177,13 +177,13 @@ public :
|
|||||||
void Concat( const wxGraphicsMatrix &t ) { Concat( &t ); }
|
void Concat( const wxGraphicsMatrix &t ) { Concat( &t ); }
|
||||||
|
|
||||||
// sets the matrix to the respective values
|
// 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,
|
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);
|
wxDouble tx=0.0, wxDouble ty=0.0);
|
||||||
|
|
||||||
// gets the component valuess of the matrix
|
// gets the component valuess of the matrix
|
||||||
virtual void Get(wxDouble* a=NULL, wxDouble* b=NULL, wxDouble* c=NULL,
|
virtual void Get(wxDouble* a=NULL, wxDouble* b=NULL, wxDouble* c=NULL,
|
||||||
wxDouble* d=NULL, wxDouble* tx=NULL, wxDouble* ty=NULL) const;
|
wxDouble* d=NULL, wxDouble* tx=NULL, wxDouble* ty=NULL) const;
|
||||||
|
|
||||||
// makes this the inverse matrix
|
// makes this the inverse matrix
|
||||||
virtual void Invert();
|
virtual void Invert();
|
||||||
|
|
||||||
@@ -205,7 +205,7 @@ public :
|
|||||||
virtual void Scale( wxDouble xScale , wxDouble yScale );
|
virtual void Scale( wxDouble xScale , wxDouble yScale );
|
||||||
|
|
||||||
// add the rotation to this matrix (radians)
|
// add the rotation to this matrix (radians)
|
||||||
virtual void Rotate( wxDouble angle );
|
virtual void Rotate( wxDouble angle );
|
||||||
|
|
||||||
//
|
//
|
||||||
// apply the transforms
|
// apply the transforms
|
||||||
@@ -220,9 +220,9 @@ public :
|
|||||||
// returns the native representation
|
// returns the native representation
|
||||||
virtual void * GetNativeMatrix() const;
|
virtual void * GetNativeMatrix() const;
|
||||||
|
|
||||||
const wxGraphicsMatrixData* GetMatrixData() const
|
const wxGraphicsMatrixData* GetMatrixData() const
|
||||||
{ return (const wxGraphicsMatrixData*) GetRefData(); }
|
{ return (const wxGraphicsMatrixData*) GetRefData(); }
|
||||||
wxGraphicsMatrixData* GetMatrixData()
|
wxGraphicsMatrixData* GetMatrixData()
|
||||||
{ return (wxGraphicsMatrixData*) GetRefData(); }
|
{ return (wxGraphicsMatrixData*) GetRefData(); }
|
||||||
|
|
||||||
private :
|
private :
|
||||||
@@ -244,7 +244,7 @@ public :
|
|||||||
// begins a new subpath at (x,y)
|
// begins a new subpath at (x,y)
|
||||||
virtual void MoveToPoint( wxDouble x, wxDouble y ) = 0;
|
virtual void MoveToPoint( wxDouble x, wxDouble y ) = 0;
|
||||||
|
|
||||||
// adds a straight line from the current point to (x,y)
|
// adds a straight line from the current point to (x,y)
|
||||||
virtual void AddLineToPoint( wxDouble x, wxDouble y ) = 0;
|
virtual void AddLineToPoint( wxDouble x, wxDouble y ) = 0;
|
||||||
|
|
||||||
// adds a cubic Bezier curve from the current point, using two control points and an end point
|
// adds a cubic Bezier curve from the current point, using two control points and an end point
|
||||||
@@ -263,14 +263,14 @@ public :
|
|||||||
virtual void AddArc( wxDouble x, wxDouble y, wxDouble r, wxDouble startAngle, wxDouble endAngle, bool clockwise ) = 0;
|
virtual void AddArc( wxDouble x, wxDouble y, wxDouble r, wxDouble startAngle, wxDouble endAngle, bool clockwise ) = 0;
|
||||||
|
|
||||||
//
|
//
|
||||||
// These are convenience functions which - if not available natively will be assembled
|
// These are convenience functions which - if not available natively will be assembled
|
||||||
// using the primitives from above
|
// using the primitives from above
|
||||||
//
|
//
|
||||||
|
|
||||||
// adds a quadratic Bezier curve from the current point, using a control point and an end point
|
// 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 );
|
virtual void AddQuadCurveToPoint( wxDouble cx, wxDouble cy, wxDouble x, wxDouble y );
|
||||||
|
|
||||||
// appends a rectangle as a new closed subpath
|
// appends a rectangle as a new closed subpath
|
||||||
virtual void AddRectangle( wxDouble x, wxDouble y, wxDouble w, wxDouble h );
|
virtual void AddRectangle( wxDouble x, wxDouble y, wxDouble w, wxDouble h );
|
||||||
|
|
||||||
// appends an ellipsis as a new closed subpath fitting the passed rectangle
|
// appends an ellipsis as a new closed subpath fitting the passed rectangle
|
||||||
@@ -305,7 +305,7 @@ class WXDLLIMPEXP_CORE wxGraphicsPath : public wxGraphicsObject
|
|||||||
public :
|
public :
|
||||||
wxGraphicsPath() {}
|
wxGraphicsPath() {}
|
||||||
virtual ~wxGraphicsPath() {}
|
virtual ~wxGraphicsPath() {}
|
||||||
|
|
||||||
//
|
//
|
||||||
// These are the path primitives from which everything else can be constructed
|
// These are the path primitives from which everything else can be constructed
|
||||||
//
|
//
|
||||||
@@ -314,14 +314,14 @@ public :
|
|||||||
virtual void MoveToPoint( wxDouble x, wxDouble 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)
|
// adds a straight line from the current point to (x,y)
|
||||||
virtual void AddLineToPoint( wxDouble x, wxDouble 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
|
// 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 ) ;
|
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
|
// adds another path
|
||||||
virtual void AddPath( const wxGraphicsPath& path );
|
virtual void AddPath( const wxGraphicsPath& path );
|
||||||
|
|
||||||
@@ -337,14 +337,14 @@ public :
|
|||||||
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);
|
||||||
|
|
||||||
//
|
//
|
||||||
// These are convenience functions which - if not available natively will be assembled
|
// These are convenience functions which - if not available natively will be assembled
|
||||||
// using the primitives from above
|
// using the primitives from above
|
||||||
//
|
//
|
||||||
|
|
||||||
// adds a quadratic Bezier curve from the current point, using a control point and an end point
|
// 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 );
|
virtual void AddQuadCurveToPoint( wxDouble cx, wxDouble cy, wxDouble x, wxDouble y );
|
||||||
|
|
||||||
// appends a rectangle as a new closed subpath
|
// appends a rectangle as a new closed subpath
|
||||||
virtual void AddRectangle( wxDouble x, wxDouble y, wxDouble w, wxDouble h );
|
virtual void AddRectangle( wxDouble x, wxDouble y, wxDouble w, wxDouble h );
|
||||||
|
|
||||||
// appends an ellipsis as a new closed subpath fitting the passed rectangle
|
// appends an ellipsis as a new closed subpath fitting the passed rectangle
|
||||||
@@ -352,7 +352,7 @@ public :
|
|||||||
|
|
||||||
// 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)
|
// 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 ) ;
|
||||||
|
|
||||||
// appends an ellipse
|
// appends an ellipse
|
||||||
virtual void AddEllipse( wxDouble x, wxDouble y, wxDouble w, wxDouble h);
|
virtual void AddEllipse( wxDouble x, wxDouble y, wxDouble w, wxDouble h);
|
||||||
|
|
||||||
@@ -361,23 +361,23 @@ public :
|
|||||||
|
|
||||||
// returns the native path
|
// returns the native path
|
||||||
virtual void * GetNativePath() const;
|
virtual void * GetNativePath() const;
|
||||||
|
|
||||||
// give the native path returned by GetNativePath() back (there might be some deallocations necessary)
|
// give the native path returned by GetNativePath() back (there might be some deallocations necessary)
|
||||||
virtual void UnGetNativePath(void *p)const;
|
virtual void UnGetNativePath(void *p)const;
|
||||||
|
|
||||||
// transforms each point of this path by the matrix
|
// transforms each point of this path by the matrix
|
||||||
virtual void Transform( const wxGraphicsMatrix& matrix );
|
virtual void Transform( const wxGraphicsMatrix& matrix );
|
||||||
|
|
||||||
// gets the bounding box enclosing all points (possibly including control points)
|
// gets the bounding box enclosing all points (possibly including control points)
|
||||||
virtual void GetBox(wxDouble *x, wxDouble *y, wxDouble *w, wxDouble *h)const;
|
virtual void GetBox(wxDouble *x, wxDouble *y, wxDouble *w, wxDouble *h)const;
|
||||||
wxRect2DDouble GetBox()const;
|
wxRect2DDouble GetBox()const;
|
||||||
|
|
||||||
virtual bool Contains( wxDouble x, wxDouble y, int fillStyle = wxODDEVEN_RULE)const;
|
virtual bool Contains( wxDouble x, wxDouble y, int fillStyle = wxODDEVEN_RULE)const;
|
||||||
bool Contains( const wxPoint2DDouble& c, int fillStyle = wxODDEVEN_RULE)const;
|
bool Contains( const wxPoint2DDouble& c, int fillStyle = wxODDEVEN_RULE)const;
|
||||||
|
|
||||||
const wxGraphicsPathData* GetPathData() const
|
const wxGraphicsPathData* GetPathData() const
|
||||||
{ return (const wxGraphicsPathData*) GetRefData(); }
|
{ return (const wxGraphicsPathData*) GetRefData(); }
|
||||||
wxGraphicsPathData* GetPathData()
|
wxGraphicsPathData* GetPathData()
|
||||||
{ return (wxGraphicsPathData*) GetRefData(); }
|
{ return (wxGraphicsPathData*) GetRefData(); }
|
||||||
|
|
||||||
private :
|
private :
|
||||||
@@ -393,12 +393,12 @@ public:
|
|||||||
wxGraphicsContext(wxGraphicsRenderer* renderer);
|
wxGraphicsContext(wxGraphicsRenderer* renderer);
|
||||||
|
|
||||||
virtual ~wxGraphicsContext();
|
virtual ~wxGraphicsContext();
|
||||||
|
|
||||||
static wxGraphicsContext* Create( const wxWindowDC& dc) ;
|
static wxGraphicsContext* Create( const wxWindowDC& dc) ;
|
||||||
|
|
||||||
#ifdef __WXMSW__
|
#ifdef __WXMSW__
|
||||||
static wxGraphicsContext * Create( const wxMemoryDC& dc) ;
|
static wxGraphicsContext * Create( const wxMemoryDC& dc) ;
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
static wxGraphicsContext* CreateFromNative( void * context ) ;
|
static wxGraphicsContext* CreateFromNative( void * context ) ;
|
||||||
|
|
||||||
@@ -410,16 +410,16 @@ public:
|
|||||||
static wxGraphicsContext * Create();
|
static wxGraphicsContext * Create();
|
||||||
|
|
||||||
wxGraphicsPath CreatePath() const;
|
wxGraphicsPath CreatePath() const;
|
||||||
|
|
||||||
virtual wxGraphicsPen CreatePen(const wxPen& pen) const;
|
virtual wxGraphicsPen CreatePen(const wxPen& pen) const;
|
||||||
|
|
||||||
virtual wxGraphicsBrush CreateBrush(const wxBrush& brush ) 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
|
// 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) const;
|
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)
|
// 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
|
// 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) const;
|
const wxColour &oColor, const wxColour &cColor) const;
|
||||||
@@ -428,9 +428,9 @@ public:
|
|||||||
virtual wxGraphicsFont CreateFont( const wxFont &font , const wxColour &col = *wxBLACK ) const;
|
virtual wxGraphicsFont CreateFont( const wxFont &font , const wxColour &col = *wxBLACK ) const;
|
||||||
|
|
||||||
// create a 'native' matrix corresponding to these values
|
// 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,
|
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;
|
wxDouble tx=0.0, wxDouble ty=0.0) const;
|
||||||
|
|
||||||
// push the current state of the context, ie the transformation matrix on a stack
|
// push the current state of the context, ie the transformation matrix on a stack
|
||||||
virtual void PushState() = 0;
|
virtual void PushState() = 0;
|
||||||
|
|
||||||
@@ -442,7 +442,7 @@ public:
|
|||||||
|
|
||||||
// clips drawings to the rect intersected with the current clipping region
|
// clips drawings to the rect intersected with the current clipping region
|
||||||
virtual void Clip( wxDouble x, wxDouble y, wxDouble w, wxDouble h ) = 0;
|
virtual void Clip( wxDouble x, wxDouble y, wxDouble w, wxDouble h ) = 0;
|
||||||
|
|
||||||
// resets the clipping to original extent
|
// resets the clipping to original extent
|
||||||
virtual void ResetClip() = 0 ;
|
virtual void ResetClip() = 0 ;
|
||||||
|
|
||||||
@@ -451,14 +451,14 @@ public:
|
|||||||
|
|
||||||
// returns the current logical function
|
// returns the current logical function
|
||||||
virtual int GetLogicalFunction() const { return m_logicalFunction; }
|
virtual int GetLogicalFunction() const { return m_logicalFunction; }
|
||||||
|
|
||||||
// sets the current logical function, returns true if it supported
|
// sets the current logical function, returns true if it supported
|
||||||
virtual bool SetLogicalFunction(int function) ;
|
virtual bool SetLogicalFunction(int function) ;
|
||||||
|
|
||||||
//
|
//
|
||||||
// transformation : changes the current transformation matrix CTM of the context
|
// transformation : changes the current transformation matrix CTM of the context
|
||||||
//
|
//
|
||||||
|
|
||||||
// translate
|
// translate
|
||||||
virtual void Translate( wxDouble dx , wxDouble dy ) = 0;
|
virtual void Translate( wxDouble dx , wxDouble dy ) = 0;
|
||||||
|
|
||||||
@@ -467,7 +467,7 @@ public:
|
|||||||
|
|
||||||
// rotate (radians)
|
// rotate (radians)
|
||||||
virtual void Rotate( wxDouble angle ) = 0;
|
virtual void Rotate( wxDouble angle ) = 0;
|
||||||
|
|
||||||
// concatenates this transform with the current transform of this context
|
// concatenates this transform with the current transform of this context
|
||||||
virtual void ConcatTransform( const wxGraphicsMatrix& matrix ) = 0;
|
virtual void ConcatTransform( const wxGraphicsMatrix& matrix ) = 0;
|
||||||
|
|
||||||
@@ -479,23 +479,23 @@ public:
|
|||||||
//
|
//
|
||||||
// setting the paint
|
// setting the paint
|
||||||
//
|
//
|
||||||
|
|
||||||
// sets the pen
|
// sets the pen
|
||||||
virtual void SetPen( const wxGraphicsPen& pen );
|
virtual void SetPen( const wxGraphicsPen& pen );
|
||||||
|
|
||||||
void SetPen( const wxPen& pen );
|
void SetPen( const wxPen& pen );
|
||||||
|
|
||||||
// sets the brush for filling
|
// sets the brush for filling
|
||||||
virtual void SetBrush( const wxGraphicsBrush& brush );
|
virtual void SetBrush( const wxGraphicsBrush& brush );
|
||||||
|
|
||||||
void SetBrush( const wxBrush& brush );
|
void SetBrush( const wxBrush& brush );
|
||||||
|
|
||||||
// sets the font
|
// sets the font
|
||||||
virtual void SetFont( const wxGraphicsFont& font );
|
virtual void SetFont( const wxGraphicsFont& font );
|
||||||
|
|
||||||
void SetFont( const wxFont& font, const wxColour& colour );
|
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;
|
||||||
|
|
||||||
@@ -504,11 +504,11 @@ public:
|
|||||||
|
|
||||||
// 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 = wxODDEVEN_RULE );
|
virtual void DrawPath( const wxGraphicsPath& path, int fillStyle = wxODDEVEN_RULE );
|
||||||
|
|
||||||
//
|
//
|
||||||
// text
|
// text
|
||||||
//
|
//
|
||||||
|
|
||||||
virtual void DrawText( const wxString &str, wxDouble x, wxDouble y ) = 0;
|
virtual void DrawText( const wxString &str, wxDouble x, wxDouble y ) = 0;
|
||||||
|
|
||||||
virtual void DrawText( const wxString &str, wxDouble x, wxDouble y, wxDouble angle );
|
virtual void DrawText( const wxString &str, wxDouble x, wxDouble y, wxDouble angle );
|
||||||
@@ -533,7 +533,7 @@ public:
|
|||||||
//
|
//
|
||||||
// convenience methods
|
// convenience methods
|
||||||
//
|
//
|
||||||
|
|
||||||
// strokes a single line
|
// strokes a single line
|
||||||
virtual void StrokeLine( wxDouble x1, wxDouble y1, wxDouble x2, wxDouble y2);
|
virtual void StrokeLine( wxDouble x1, wxDouble y1, wxDouble x2, wxDouble y2);
|
||||||
|
|
||||||
@@ -572,7 +572,7 @@ private :
|
|||||||
DECLARE_ABSTRACT_CLASS(wxGraphicsContext)
|
DECLARE_ABSTRACT_CLASS(wxGraphicsContext)
|
||||||
};
|
};
|
||||||
|
|
||||||
#if 0
|
#if 0
|
||||||
|
|
||||||
//
|
//
|
||||||
// A graphics figure allows to cache path, pen etc creations, also will be a basis for layering/grouping elements
|
// A graphics figure allows to cache path, pen etc creations, also will be a basis for layering/grouping elements
|
||||||
@@ -582,30 +582,30 @@ class WXDLLIMPEXP_CORE wxGraphicsFigure : public wxGraphicsObject
|
|||||||
{
|
{
|
||||||
public :
|
public :
|
||||||
wxGraphicsFigure(wxGraphicsRenderer* renderer) ;
|
wxGraphicsFigure(wxGraphicsRenderer* renderer) ;
|
||||||
|
|
||||||
virtual ~wxGraphicsFigure() ;
|
virtual ~wxGraphicsFigure() ;
|
||||||
|
|
||||||
void SetPath( wxGraphicsMatrix* matrix );
|
void SetPath( wxGraphicsMatrix* matrix );
|
||||||
|
|
||||||
void SetMatrix( wxGraphicsPath* path);
|
void SetMatrix( wxGraphicsPath* path);
|
||||||
|
|
||||||
// draws this object on the context
|
// draws this object on the context
|
||||||
virtual void Draw( wxGraphicsContext* cg );
|
virtual void Draw( wxGraphicsContext* cg );
|
||||||
|
|
||||||
// returns the path of this object
|
// returns the path of this object
|
||||||
wxGraphicsPath* GetPath() { return m_path; }
|
wxGraphicsPath* GetPath() { return m_path; }
|
||||||
|
|
||||||
// returns the transformation matrix of this object, may be null if there is no transformation necessary
|
// returns the transformation matrix of this object, may be null if there is no transformation necessary
|
||||||
wxGraphicsMatrix* GetMatrix() { return m_matrix; }
|
wxGraphicsMatrix* GetMatrix() { return m_matrix; }
|
||||||
|
|
||||||
private :
|
private :
|
||||||
wxGraphicsMatrix* m_matrix;
|
wxGraphicsMatrix* m_matrix;
|
||||||
wxGraphicsPath* m_path;
|
wxGraphicsPath* m_path;
|
||||||
|
|
||||||
DECLARE_DYNAMIC_CLASS(wxGraphicsFigure)
|
DECLARE_DYNAMIC_CLASS(wxGraphicsFigure)
|
||||||
} ;
|
} ;
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
//
|
//
|
||||||
// The graphics renderer is the instance corresponding to the rendering engine used, eg there is ONE core graphics renderer
|
// The graphics renderer is the instance corresponding to the rendering engine used, eg there is ONE core graphics renderer
|
||||||
@@ -627,7 +627,7 @@ public :
|
|||||||
virtual wxGraphicsContext * CreateContext( const wxWindowDC& dc) = 0 ;
|
virtual wxGraphicsContext * CreateContext( const wxWindowDC& dc) = 0 ;
|
||||||
#ifdef __WXMSW__
|
#ifdef __WXMSW__
|
||||||
virtual wxGraphicsContext * CreateContext( const wxMemoryDC& dc) = 0 ;
|
virtual wxGraphicsContext * CreateContext( const wxMemoryDC& dc) = 0 ;
|
||||||
#endif
|
#endif
|
||||||
virtual wxGraphicsContext * CreateContextFromNativeContext( void * context ) = 0;
|
virtual wxGraphicsContext * CreateContextFromNativeContext( void * context ) = 0;
|
||||||
|
|
||||||
virtual wxGraphicsContext * CreateContextFromNativeWindow( void * window ) = 0;
|
virtual wxGraphicsContext * CreateContextFromNativeWindow( void * window ) = 0;
|
||||||
@@ -638,32 +638,32 @@ public :
|
|||||||
virtual wxGraphicsContext * CreateMeasuringContext() = 0;
|
virtual wxGraphicsContext * CreateMeasuringContext() = 0;
|
||||||
|
|
||||||
// Path
|
// Path
|
||||||
|
|
||||||
virtual wxGraphicsPath CreatePath() = 0;
|
virtual wxGraphicsPath CreatePath() = 0;
|
||||||
|
|
||||||
// Matrix
|
// Matrix
|
||||||
|
|
||||||
virtual wxGraphicsMatrix CreateMatrix( wxDouble a=1.0, wxDouble b=0.0, wxDouble c=0.0, wxDouble d=1.0,
|
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;
|
wxDouble tx=0.0, wxDouble ty=0.0) = 0;
|
||||||
|
|
||||||
// Paints
|
// 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
|
// 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;
|
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)
|
// 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
|
// 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;
|
const wxColour &oColor, const wxColour &cColor) = 0;
|
||||||
|
|
||||||
// sets the font
|
// 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 :
|
private :
|
||||||
DECLARE_NO_COPY_CLASS(wxGraphicsRenderer)
|
DECLARE_NO_COPY_CLASS(wxGraphicsRenderer)
|
||||||
DECLARE_ABSTRACT_CLASS(wxGraphicsRenderer)
|
DECLARE_ABSTRACT_CLASS(wxGraphicsRenderer)
|
||||||
|
Reference in New Issue
Block a user