#include <gtk/gtk.h>
#endif
-class WXDLLIMPEXP_CORE wxCairoPath : public wxGraphicsPath
+class WXDLLIMPEXP_CORE wxCairoPathData : public wxGraphicsPathData
{
public :
- wxCairoPath();
- wxCairoPath(wxGraphicsRenderer* renderer, cairo_t* pathcontext = NULL);
- ~wxCairoPath();
+ wxCairoPathData(wxGraphicsRenderer* renderer, cairo_t* path = NULL);
+ ~wxCairoPathData();
- virtual wxGraphicsPath *Clone() const;
+ virtual wxGraphicsObjectRefData *Clone() const;
//
// These are the path primitives from which everything else can be constructed
virtual void AddArc( wxDouble x, wxDouble y, wxDouble r, wxDouble startAngle, wxDouble endAngle, bool clockwise ) ;
// gets the last point of the current path, (0,0) if not yet set
- virtual void GetCurrentPoint( wxDouble& x, wxDouble&y) ;
+ virtual void GetCurrentPoint( wxDouble* x, wxDouble* y) const;
// adds another path
- virtual void AddPath( const wxGraphicsPath* path );
+ virtual void AddPath( const wxGraphicsPathData* path );
// closes the current sub-path
virtual void CloseSubpath();
virtual void * GetNativePath() const ;
// give the native path returned by GetNativePath() back (there might be some deallocations necessary)
- virtual void UnGetNativePath(void *p) ;
+ virtual void UnGetNativePath(void *p) const;
// transforms each point of this path by the matrix
- virtual void Transform( wxGraphicsMatrix* matrix ) ;
+ virtual void Transform( const wxGraphicsMatrixData* matrix ) ;
// gets the bounding box enclosing all points (possibly including control points)
- virtual void GetBox(wxDouble *x, wxDouble *y, wxDouble *w, wxDouble *h) ;
+ virtual void GetBox(wxDouble *x, wxDouble *y, wxDouble *w, wxDouble *h) const;
- virtual bool Contains( wxDouble x, wxDouble y, int fillStyle = wxWINDING_RULE) ;
+ virtual bool Contains( wxDouble x, wxDouble y, int fillStyle = wxWINDING_RULE) const;
private :
cairo_t* m_pathContext;
- DECLARE_DYNAMIC_CLASS_NO_COPY(wxCairoPath)
};
-class WXDLLIMPEXP_CORE wxCairoMatrix : public wxGraphicsMatrix
+class WXDLLIMPEXP_CORE wxCairoMatrixData : public wxGraphicsMatrixData
{
public :
- wxCairoMatrix() ;
+ wxCairoMatrixData(wxGraphicsRenderer* renderer, const cairo_matrix_t* matrix = NULL ) ;
+ virtual ~wxCairoMatrixData() ;
- wxCairoMatrix(wxGraphicsRenderer* renderer, const cairo_matrix_t* matrix = NULL ) ;
- virtual ~wxCairoMatrix() ;
-
- virtual wxGraphicsMatrix *Clone() const ;
+ virtual wxGraphicsObjectRefData *Clone() const ;
// concatenates the matrix
- virtual void Concat( const wxGraphicsMatrix *t );
-
- // copies the passed in matrix
- virtual void Copy( const wxGraphicsMatrix *t );
+ virtual void Concat( const wxGraphicsMatrixData *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 ;
+ virtual bool IsEqual( const wxGraphicsMatrixData* t) const ;
// return true if this is the identity matrix
- virtual bool IsIdentity();
+ virtual bool IsIdentity() const;
//
// transformation
//
// applies that matrix to the point
- virtual void TransformPoint( wxDouble *x, wxDouble *y );
+ virtual void TransformPoint( wxDouble *x, wxDouble *y ) const;
// applies the matrix except for translations
- virtual void TransformDistance( wxDouble *dx, wxDouble *dy );
+ virtual void TransformDistance( wxDouble *dx, wxDouble *dy ) const;
// returns the native representation
virtual void * GetNativeMatrix() const;
private:
cairo_matrix_t m_matrix ;
-
- DECLARE_DYNAMIC_CLASS_NO_COPY(wxCairoMatrix)
} ;
-class WXDLLIMPEXP_CORE wxCairoPen : public wxGraphicsPen
+class WXDLLIMPEXP_CORE wxCairoPenData : public wxGraphicsObjectRefData
{
public:
- wxCairoPen();
- wxCairoPen( wxGraphicsRenderer* renderer, const wxPen &pen );
- ~wxCairoPen();
+ wxCairoPenData( wxGraphicsRenderer* renderer, const wxPen &pen );
+ ~wxCairoPenData();
void Init();
double *m_userLengths;
wxPen m_pen;
- DECLARE_DYNAMIC_CLASS_NO_COPY(wxCairoPen)
};
-class WXDLLIMPEXP_CORE wxCairoBrush : public wxGraphicsBrush
+class WXDLLIMPEXP_CORE wxCairoBrushData : public wxGraphicsObjectRefData
{
public:
- wxCairoBrush();
- wxCairoBrush( wxGraphicsRenderer* renderer );
- wxCairoBrush( wxGraphicsRenderer* renderer, const wxBrush &brush );
- ~wxCairoBrush ();
+ wxCairoBrushData( wxGraphicsRenderer* renderer );
+ wxCairoBrushData( wxGraphicsRenderer* renderer, const wxBrush &brush );
+ ~wxCairoBrushData ();
virtual void Apply( wxGraphicsContext* context );
void CreateLinearGradientBrush( wxDouble x1, wxDouble y1, wxDouble x2, wxDouble y2,
double m_alpha;
cairo_pattern_t* m_brushPattern;
-
- DECLARE_DYNAMIC_CLASS_NO_COPY(wxCairoBrush)
};
-class wxCairoFont : public wxGraphicsFont
+class wxCairoFontData : public wxGraphicsObjectRefData
{
public:
- wxCairoFont();
- wxCairoFont( wxGraphicsRenderer* renderer, const wxFont &font, const wxColour& col );
- ~wxCairoFont();
+ wxCairoFontData( wxGraphicsRenderer* renderer, const wxFont &font, const wxColour& col );
+ ~wxCairoFontData();
virtual void Apply( wxGraphicsContext* context );
private :
double m_green;
double m_blue;
double m_alpha;
- DECLARE_DYNAMIC_CLASS_NO_COPY(wxCairoFont)
};
class WXDLLIMPEXP_CORE wxCairoContext : public wxGraphicsContext
virtual void * GetNativeContext();
- virtual void StrokePath( const wxGraphicsPath *p );
- virtual void FillPath( const wxGraphicsPath *p , int fillStyle = wxWINDING_RULE );
+ virtual void StrokePath( const wxGraphicsPath& p );
+ virtual void FillPath( const wxGraphicsPath& p , int fillStyle = wxWINDING_RULE );
virtual void Translate( wxDouble dx , wxDouble dy );
virtual void Scale( wxDouble xScale , wxDouble yScale );
virtual void Rotate( wxDouble angle );
// concatenates this transform with the current transform of this context
- virtual void ConcatTransform( const wxGraphicsMatrix* matrix );
+ virtual void ConcatTransform( const wxGraphicsMatrix& matrix );
// sets the transform of this context
- virtual void SetTransform( const wxGraphicsMatrix* matrix );
+ virtual void SetTransform( const wxGraphicsMatrix& matrix );
// gets the matrix of this context
- virtual void GetTransform( wxGraphicsMatrix* matrix );
+ virtual wxGraphicsMatrix GetTransform() const;
virtual void DrawBitmap( const wxBitmap &bmp, wxDouble x, wxDouble y, wxDouble w, wxDouble h );
virtual void DrawIcon( const wxIcon &icon, wxDouble x, wxDouble y, wxDouble w, wxDouble h );
};
//-----------------------------------------------------------------------------
-// wxCairoPen implementation
+// wxCairoPenData implementation
//-----------------------------------------------------------------------------
-IMPLEMENT_DYNAMIC_CLASS(wxCairoPen,wxGraphicsPen)
-
-wxCairoPen::wxCairoPen() : wxGraphicsPen(NULL)
-{
- wxLogDebug(wxT("Illegal Constructor called"));
-}
-
-wxCairoPen::~wxCairoPen()
+wxCairoPenData::~wxCairoPenData()
{
delete[] m_userLengths;
}
-void wxCairoPen::Init()
+void wxCairoPenData::Init()
{
m_lengths = NULL;
m_userLengths = NULL;
m_count = 0;
}
-wxCairoPen::wxCairoPen( wxGraphicsRenderer* renderer, const wxPen &pen )
-: wxGraphicsPen(renderer)
+wxCairoPenData::wxCairoPenData( wxGraphicsRenderer* renderer, const wxPen &pen )
+: wxGraphicsObjectRefData(renderer)
{
Init();
- m_width = pen.GetWidth();
+ m_pen = pen;
+ m_width = m_pen.GetWidth();
if (m_width <= 0.0)
m_width = 0.1;
}
}
-void wxCairoPen::Apply( wxGraphicsContext* context )
+void wxCairoPenData::Apply( wxGraphicsContext* context )
{
cairo_t * ctext = (cairo_t*) context->GetNativeContext();
cairo_set_line_width(ctext,m_width);
}
//-----------------------------------------------------------------------------
-// wxCairoBrush implementation
+// wxCairoBrushData implementation
//-----------------------------------------------------------------------------
-IMPLEMENT_DYNAMIC_CLASS(wxCairoBrush,wxGraphicsBrush)
-
-wxCairoBrush::wxCairoBrush() : wxGraphicsBrush( NULL )
-{
- wxLogDebug(wxT("Illegal Constructor called"));
-}
-
-wxCairoBrush::wxCairoBrush( wxGraphicsRenderer* renderer ) : wxGraphicsBrush( renderer )
+wxCairoBrushData::wxCairoBrushData( wxGraphicsRenderer* renderer )
+ : wxGraphicsObjectRefData( renderer )
{
Init();
}
-wxCairoBrush::wxCairoBrush( wxGraphicsRenderer* renderer, const wxBrush &brush )
-: wxGraphicsBrush(renderer)
+wxCairoBrushData::wxCairoBrushData( wxGraphicsRenderer* renderer, const wxBrush &brush )
+ : wxGraphicsObjectRefData(renderer)
{
+ Init();
+
m_red = brush.GetColour().Red()/255.0;
m_green = brush.GetColour().Green()/255.0;
m_blue = brush.GetColour().Blue()/255.0;
*/
}
-wxCairoBrush::~wxCairoBrush ()
+wxCairoBrushData::~wxCairoBrushData ()
{
if (m_brushPattern)
cairo_pattern_destroy(m_brushPattern);
}
-void wxCairoBrush::Apply( wxGraphicsContext* context )
+void wxCairoBrushData::Apply( wxGraphicsContext* context )
{
cairo_t * ctext = (cairo_t*) context->GetNativeContext();
if ( m_brushPattern )
}
}
-void wxCairoBrush::CreateLinearGradientBrush( wxDouble x1, wxDouble y1, wxDouble x2, wxDouble y2,
+void wxCairoBrushData::CreateLinearGradientBrush( wxDouble x1, wxDouble y1, wxDouble x2, wxDouble y2,
const wxColour&c1, const wxColour&c2 )
{
m_brushPattern = cairo_pattern_create_linear(x1,y1,x2,y2);
wxASSERT_MSG(cairo_pattern_status(m_brushPattern) == CAIRO_STATUS_SUCCESS, wxT("Couldn't create cairo pattern"));
}
-void wxCairoBrush::CreateRadialGradientBrush( wxDouble xo, wxDouble yo, wxDouble xc, wxDouble yc, wxDouble radius,
+void wxCairoBrushData::CreateRadialGradientBrush( wxDouble xo, wxDouble yo, wxDouble xc, wxDouble yc, wxDouble radius,
const wxColour &oColor, const wxColour &cColor )
{
m_brushPattern = cairo_pattern_create_radial(xo,yo,0.0,xc,yc,radius);
wxASSERT_MSG(cairo_pattern_status(m_brushPattern) == CAIRO_STATUS_SUCCESS, wxT("Couldn't create cairo pattern"));
}
-void wxCairoBrush::Init()
+void wxCairoBrushData::Init()
{
m_brushPattern = NULL;
}
//-----------------------------------------------------------------------------
-// wxCairoFont implementation
+// wxCairoFontData implementation
//-----------------------------------------------------------------------------
-IMPLEMENT_DYNAMIC_CLASS(wxCairoFont,wxGraphicsFont)
-
-wxCairoFont::wxCairoFont() : wxGraphicsFont(NULL)
-{
- wxLogDebug(wxT("Illegal Constructor called"));
-}
-
-wxCairoFont::wxCairoFont( wxGraphicsRenderer* renderer, const wxFont &font,
- const wxColour& col ) : wxGraphicsFont(renderer)
+wxCairoFontData::wxCairoFontData( wxGraphicsRenderer* renderer, const wxFont &font,
+ const wxColour& col ) : wxGraphicsObjectRefData(renderer)
{
m_red = col.Red()/255.0;
m_green = col.Green()/255.0;
m_weight = font.GetWeight() == wxFONTWEIGHT_BOLD ? CAIRO_FONT_WEIGHT_BOLD:CAIRO_FONT_WEIGHT_NORMAL;
}
-wxCairoFont::~wxCairoFont()
+wxCairoFontData::~wxCairoFontData()
{
}
-void wxCairoFont::Apply( wxGraphicsContext* context )
+void wxCairoFontData::Apply( wxGraphicsContext* context )
{
cairo_t * ctext = (cairo_t*) context->GetNativeContext();
cairo_set_source_rgba(ctext,m_red,m_green, m_blue,m_alpha);
}
//-----------------------------------------------------------------------------
-// wxCairoPath implementation
+// wxCairoPathData implementation
//-----------------------------------------------------------------------------
-IMPLEMENT_DYNAMIC_CLASS(wxCairoPath,wxGraphicsPath)
-
-wxCairoPath::wxCairoPath() : wxGraphicsPath(NULL)
-{
- wxLogDebug(wxT("Illegal Constructor called"));
-}
-
-wxCairoPath::wxCairoPath( wxGraphicsRenderer* renderer, cairo_t* pathcontext)
- : wxGraphicsPath(renderer)
+wxCairoPathData::wxCairoPathData( wxGraphicsRenderer* renderer, cairo_t* pathcontext)
+ : wxGraphicsPathData(renderer)
{
if (pathcontext)
{
}
}
-wxCairoPath::~wxCairoPath()
+wxCairoPathData::~wxCairoPathData()
{
cairo_destroy(m_pathContext);
}
-wxGraphicsPath *wxCairoPath::Clone() const
+wxGraphicsObjectRefData *wxCairoPathData::Clone() const
{
cairo_surface_t* surface = cairo_image_surface_create(CAIRO_FORMAT_ARGB32,1,1);
cairo_t* pathcontext = cairo_create(surface);
cairo_path_t* path = cairo_copy_path(m_pathContext);
cairo_append_path(pathcontext, path);
cairo_path_destroy(path);
- return new wxCairoPath( GetRenderer() ,pathcontext);
+ return new wxCairoPathData( GetRenderer() ,pathcontext);
}
-void* wxCairoPath::GetNativePath() const
+void* wxCairoPathData::GetNativePath() const
{
return cairo_copy_path(m_pathContext) ;
}
-void wxCairoPath::UnGetNativePath(void *p)
+void wxCairoPathData::UnGetNativePath(void *p) const
{
cairo_path_destroy((cairo_path_t*)p);
}
// The Primitives
//
-void wxCairoPath::MoveToPoint( wxDouble x , wxDouble y )
+void wxCairoPathData::MoveToPoint( wxDouble x , wxDouble y )
{
cairo_move_to(m_pathContext,x,y);
}
-void wxCairoPath::AddLineToPoint( wxDouble x , wxDouble y )
+void wxCairoPathData::AddLineToPoint( wxDouble x , wxDouble y )
{
cairo_line_to(m_pathContext,x,y);
}
-void wxCairoPath::AddPath( const wxGraphicsPath* path )
+void wxCairoPathData::AddPath( const wxGraphicsPathData* path )
{
// TODO
}
-void wxCairoPath::CloseSubpath()
+void wxCairoPathData::CloseSubpath()
{
cairo_close_path(m_pathContext);
}
-void wxCairoPath::AddCurveToPoint( wxDouble cx1, wxDouble cy1, wxDouble cx2, wxDouble cy2, wxDouble x, wxDouble y )
+void wxCairoPathData::AddCurveToPoint( wxDouble cx1, wxDouble cy1, wxDouble cx2, wxDouble cy2, wxDouble x, wxDouble y )
{
cairo_curve_to(m_pathContext,cx1,cy1,cx2,cy2,x,y);
}
// gets the last point of the current path, (0,0) if not yet set
-void wxCairoPath::GetCurrentPoint( wxDouble& x, wxDouble&y)
+void wxCairoPathData::GetCurrentPoint( wxDouble* x, wxDouble* y) const
{
double dx,dy;
cairo_get_current_point(m_pathContext,&dx,&dy);
- x = dx;
- y = dy;
+ if (x)
+ *x = dx;
+ if (y)
+ *y = dy;
}
-void wxCairoPath::AddArc( wxDouble x, wxDouble y, wxDouble r, double startAngle, double endAngle, bool clockwise )
+void wxCairoPathData::AddArc( wxDouble x, wxDouble y, wxDouble r, double startAngle, double endAngle, bool clockwise )
{
// as clockwise means positive in our system (y pointing downwards)
// TODO make this interpretation dependent of the
}
// transforms each point of this path by the matrix
-void wxCairoPath::Transform( wxGraphicsMatrix* matrix )
+void wxCairoPathData::Transform( const wxGraphicsMatrixData* matrix )
{
// as we don't have a true path object, we have to apply the inverse
// matrix to the context
}
// gets the bounding box enclosing all points (possibly including control points)
-void wxCairoPath::GetBox(wxDouble *x, wxDouble *y, wxDouble *w, wxDouble *h)
+void wxCairoPathData::GetBox(wxDouble *x, wxDouble *y, wxDouble *w, wxDouble *h) const
{
double x1,y1,x2,y2;
}
}
-bool wxCairoPath::Contains( wxDouble x, wxDouble y, int fillStyle )
+bool wxCairoPathData::Contains( wxDouble x, wxDouble y, int fillStyle ) const
{
- return cairo_in_stroke( m_pathContext, x, y) != NULL;
+ return cairo_in_stroke( m_pathContext, x, y) != 0;
}
//-----------------------------------------------------------------------------
-// wxCairoMatrix implementation
+// wxCairoMatrixData implementation
//-----------------------------------------------------------------------------
-IMPLEMENT_DYNAMIC_CLASS(wxCairoMatrix,wxGraphicsMatrix)
-
-wxCairoMatrix::wxCairoMatrix() : wxGraphicsMatrix(NULL)
-{
- wxLogDebug(wxT("Illegal Constructor called"));
-}
-
-wxCairoMatrix::wxCairoMatrix(wxGraphicsRenderer* renderer, const cairo_matrix_t* matrix )
- : wxGraphicsMatrix(renderer)
+wxCairoMatrixData::wxCairoMatrixData(wxGraphicsRenderer* renderer, const cairo_matrix_t* matrix )
+ : wxGraphicsMatrixData(renderer)
{
if ( matrix )
m_matrix = *matrix;
}
-wxCairoMatrix::~wxCairoMatrix()
+wxCairoMatrixData::~wxCairoMatrixData()
{
// nothing to do
}
-wxGraphicsMatrix *wxCairoMatrix::Clone() const
+wxGraphicsObjectRefData *wxCairoMatrixData::Clone() const
{
- return new wxCairoMatrix(GetRenderer(),&m_matrix);
+ return new wxCairoMatrixData(GetRenderer(),&m_matrix);
}
// concatenates the matrix
-void wxCairoMatrix::Concat( const wxGraphicsMatrix *t )
+void wxCairoMatrixData::Concat( const wxGraphicsMatrixData *t )
{
cairo_matrix_multiply( &m_matrix, &m_matrix, (cairo_matrix_t*) t->GetNativeMatrix());
}
-// copies the passed in matrix
-void wxCairoMatrix::Copy( const wxGraphicsMatrix *t )
-{
- m_matrix = *((cairo_matrix_t*) t->GetNativeMatrix());
-}
-
// sets the matrix to the respective values
-void wxCairoMatrix::Set(wxDouble a, wxDouble b, wxDouble c, wxDouble d,
+void wxCairoMatrixData::Set(wxDouble a, wxDouble b, wxDouble c, wxDouble d,
wxDouble tx, wxDouble ty)
{
cairo_matrix_init( &m_matrix, a, b, c, d, tx, ty);
}
+// gets the component valuess of the matrix
+void wxCairoMatrixData::Get(wxDouble* a, wxDouble* b, wxDouble* c,
+ wxDouble* d, wxDouble* tx, wxDouble* ty) const
+{
+ if (a) *a = m_matrix.xx;
+ if (b) *b = m_matrix.yx;
+ if (c) *c = m_matrix.xy;
+ if (d) *d = m_matrix.yy;
+ if (tx) *tx= m_matrix.x0;
+ if (ty) *ty= m_matrix.y0;
+}
+
// makes this the inverse matrix
-void wxCairoMatrix::Invert()
+void wxCairoMatrixData::Invert()
{
cairo_matrix_invert( &m_matrix );
}
// returns true if the elements of the transformation matrix are equal ?
-bool wxCairoMatrix::IsEqual( const wxGraphicsMatrix* t) const
+bool wxCairoMatrixData::IsEqual( const wxGraphicsMatrixData* t) const
{
const cairo_matrix_t* tm = (cairo_matrix_t*) t->GetNativeMatrix();
return (
}
// return true if this is the identity matrix
-bool wxCairoMatrix::IsIdentity()
+bool wxCairoMatrixData::IsIdentity() const
{
return ( m_matrix.xx == 1 && m_matrix.yy == 1 &&
m_matrix.yx == 0 && m_matrix.xy == 0 && m_matrix.x0 == 0 && m_matrix.y0 == 0);
//
// add the translation to this matrix
-void wxCairoMatrix::Translate( wxDouble dx , wxDouble dy )
+void wxCairoMatrixData::Translate( wxDouble dx , wxDouble dy )
{
cairo_matrix_translate( &m_matrix, dx, dy) ;
}
// add the scale to this matrix
-void wxCairoMatrix::Scale( wxDouble xScale , wxDouble yScale )
+void wxCairoMatrixData::Scale( wxDouble xScale , wxDouble yScale )
{
cairo_matrix_scale( &m_matrix, xScale, yScale) ;
}
// add the rotation to this matrix (radians)
-void wxCairoMatrix::Rotate( wxDouble angle )
+void wxCairoMatrixData::Rotate( wxDouble angle )
{
cairo_matrix_rotate( &m_matrix, angle) ;
}
//
// applies that matrix to the point
-void wxCairoMatrix::TransformPoint( wxDouble *x, wxDouble *y )
+void wxCairoMatrixData::TransformPoint( wxDouble *x, wxDouble *y ) const
{
double lx = *x, ly = *y ;
cairo_matrix_transform_point( &m_matrix, &lx, &ly);
}
// applies the matrix except for translations
-void wxCairoMatrix::TransformDistance( wxDouble *dx, wxDouble *dy )
+void wxCairoMatrixData::TransformDistance( wxDouble *dx, wxDouble *dy ) const
{
double lx = *dx, ly = *dy ;
cairo_matrix_transform_distance( &m_matrix, &lx, &ly);
}
// returns the native representation
-void * wxCairoMatrix::GetNativeMatrix() const
+void * wxCairoMatrixData::GetNativeMatrix() const
{
return (void*) &m_matrix;
}
wxCairoContext::~wxCairoContext()
{
- SetPen(NULL);
- SetBrush(NULL);
- SetFont(NULL);
-
if ( m_context )
{
PopState();
}
-void wxCairoContext::StrokePath( const wxGraphicsPath *path )
+void wxCairoContext::StrokePath( const wxGraphicsPath& path )
{
- if ( m_pen )
+ if ( !m_pen.IsNull() )
{
- cairo_path_t* cp = (cairo_path_t*) path->GetNativePath() ;
+ cairo_path_t* cp = (cairo_path_t*) path.GetNativePath() ;
cairo_append_path(m_context,cp);
- m_pen->Apply(this);
+ ((wxCairoPenData*)m_pen.GetRefData())->Apply(this);
cairo_stroke(m_context);
- wxConstCast(path, wxGraphicsPath)->UnGetNativePath(cp);
+ path.UnGetNativePath(cp);
}
}
-void wxCairoContext::FillPath( const wxGraphicsPath *path , int fillStyle )
+void wxCairoContext::FillPath( const wxGraphicsPath& path , int fillStyle )
{
- if ( m_brush )
+ if ( !m_brush.IsNull() )
{
- cairo_path_t* cp = (cairo_path_t*) path->GetNativePath() ;
+ cairo_path_t* cp = (cairo_path_t*) path.GetNativePath() ;
cairo_append_path(m_context,cp);
- m_brush->Apply(this);
+ ((wxCairoBrushData*)m_brush.GetRefData())->Apply(this);
cairo_set_fill_rule(m_context,fillStyle==wxODDEVEN_RULE ? CAIRO_FILL_RULE_EVEN_ODD : CAIRO_FILL_RULE_WINDING);
cairo_fill(m_context);
- wxConstCast(path, wxGraphicsPath)->UnGetNativePath(cp);
+ path.UnGetNativePath(cp);
}
}
}
// concatenates this transform with the current transform of this context
-void wxCairoContext::ConcatTransform( const wxGraphicsMatrix* matrix )
+void wxCairoContext::ConcatTransform( const wxGraphicsMatrix& matrix )
{
- cairo_transform(m_context,(const cairo_matrix_t *) matrix->GetNativeMatrix());
+ cairo_transform(m_context,(const cairo_matrix_t *) matrix.GetNativeMatrix());
}
// sets the transform of this context
-void wxCairoContext::SetTransform( const wxGraphicsMatrix* matrix )
+void wxCairoContext::SetTransform( const wxGraphicsMatrix& matrix )
{
- cairo_set_matrix(m_context,(const cairo_matrix_t*) matrix->GetNativeMatrix());
+ cairo_set_matrix(m_context,(const cairo_matrix_t*) matrix.GetNativeMatrix());
}
// gets the matrix of this context
-void wxCairoContext::GetTransform( wxGraphicsMatrix* matrix )
+wxGraphicsMatrix wxCairoContext::GetTransform() const
{
- cairo_get_matrix(m_context,(cairo_matrix_t*) matrix->GetNativeMatrix());
+ wxGraphicsMatrix matrix = CreateMatrix();
+ cairo_get_matrix(m_context,(cairo_matrix_t*) matrix.GetNativeMatrix());
+ return matrix;
}
void wxCairoContext::DrawText( const wxString &str, wxDouble x, wxDouble y )
{
- if ( m_font == NULL || str.IsEmpty())
+ if ( m_font.IsNull() || str.IsEmpty())
return ;
cairo_move_to(m_context,x,y);
const wxWX2MBbuf buf(str.mb_str(wxConvUTF8));
- m_font->Apply(this);
+ ((wxCairoFontData*)m_font.GetRefData())->Apply(this);
cairo_show_text(m_context,buf);
}
virtual wxGraphicsContext * CreateContext( const wxWindowDC& dc);
+#ifdef __WXMSW__
+ virtual wxGraphicsContext * CreateContext( const wxMemoryDC& dc);
+#endif
+
virtual wxGraphicsContext * CreateContextFromNativeContext( void * context );
virtual wxGraphicsContext * CreateContextFromNativeWindow( void * window );
virtual wxGraphicsContext * CreateContext( wxWindow* window );
+ virtual wxGraphicsContext * CreateMeasuringContext();
+
// Path
- virtual wxGraphicsPath * CreatePath();
+ virtual wxGraphicsPath CreatePath();
// 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);
- virtual wxGraphicsPen* CreatePen(const wxPen& pen) ;
+ virtual wxGraphicsPen CreatePen(const wxPen& pen) ;
- virtual wxGraphicsBrush* CreateBrush(const wxBrush& brush ) ;
+ virtual wxGraphicsBrush CreateBrush(const wxBrush& brush ) ;
// 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) ;
// 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) ;
// sets the font
- virtual wxGraphicsFont* CreateFont( const wxFont &font , const wxColour &col = *wxBLACK ) ;
+ virtual wxGraphicsFont CreateFont( const wxFont &font , const wxColour &col = *wxBLACK ) ;
private :
DECLARE_DYNAMIC_CLASS_NO_COPY(wxCairoRenderer)
return new wxCairoContext(this,dc);
}
+#ifdef __WXMSW__
+wxGraphicsContext * wxCairoRenderer::CreateContext( const wxMemoryDC& dc)
+{
+ return NULL;
+}
+#endif
+
wxGraphicsContext * wxCairoRenderer::CreateContextFromNativeContext( void * context )
{
return new wxCairoContext(this,(cairo_t*)context);
#endif
}
+wxGraphicsContext * wxCairoRenderer::CreateMeasuringContext()
+{
+ return NULL;
+ // TODO
+}
+
wxGraphicsContext * wxCairoRenderer::CreateContext( wxWindow* window )
{
return new wxCairoContext(this, window );
// Path
-wxGraphicsPath * wxCairoRenderer::CreatePath()
+wxGraphicsPath wxCairoRenderer::CreatePath()
{
- return new wxCairoPath( this );
+ wxGraphicsPath path;
+ path.SetRefData( new wxCairoPathData(this) );
+ return path;
}
// Matrix
-wxGraphicsMatrix * wxCairoRenderer::CreateMatrix( wxDouble a, wxDouble b, wxDouble c, wxDouble d,
- wxDouble tx, wxDouble ty)
+wxGraphicsMatrix wxCairoRenderer::CreateMatrix( wxDouble a, wxDouble b, wxDouble c, wxDouble d,
+ wxDouble tx, wxDouble ty)
{
- wxCairoMatrix* m = new wxCairoMatrix( this );
- m->Set( a,b,c,d,tx,ty ) ;
+ wxGraphicsMatrix m;
+ wxCairoMatrixData* data = new wxCairoMatrixData( this );
+ data->Set( a,b,c,d,tx,ty ) ;
+ m.SetRefData(data);
return m;
}
-wxGraphicsPen* wxCairoRenderer::CreatePen(const wxPen& pen)
+wxGraphicsPen wxCairoRenderer::CreatePen(const wxPen& pen)
{
if ( !pen.Ok() || pen.GetStyle() == wxTRANSPARENT )
- return NULL;
+ return wxNullGraphicsPen;
else
- return new wxCairoPen( this, pen );
+ {
+ wxGraphicsPen p;
+ p.SetRefData(new wxCairoPenData( this, pen ));
+ return p;
+ }
}
-wxGraphicsBrush* wxCairoRenderer::CreateBrush(const wxBrush& brush )
+wxGraphicsBrush wxCairoRenderer::CreateBrush(const wxBrush& brush )
{
if ( !brush.Ok() || brush.GetStyle() == wxTRANSPARENT )
- return NULL;
+ return wxNullGraphicsBrush;
else
- return new wxCairoBrush( this, brush );
+ {
+ wxGraphicsBrush p;
+ p.SetRefData(new wxCairoBrushData( this, brush ));
+ return p;
+ }
}
// sets the brush to a linear gradient, starting at (x1,y1) with color c1 to (x2,y2) with color c2
-wxGraphicsBrush* wxCairoRenderer::CreateLinearGradientBrush( wxDouble x1, wxDouble y1, wxDouble x2, wxDouble y2,
+wxGraphicsBrush wxCairoRenderer::CreateLinearGradientBrush( wxDouble x1, wxDouble y1, wxDouble x2, wxDouble y2,
const wxColour&c1, const wxColour&c2)
{
- wxCairoBrush* brush = new wxCairoBrush(this);
- brush->CreateLinearGradientBrush(x1, y1, x2, y2, c1, c2);
- return brush;
+ wxGraphicsBrush p;
+ wxCairoBrushData* d = new wxCairoBrushData( this );
+ d->CreateLinearGradientBrush(x1, y1, x2, y2, c1, c2);
+ p.SetRefData(d);
+ return p;
}
// 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
-wxGraphicsBrush* wxCairoRenderer::CreateRadialGradientBrush( wxDouble xo, wxDouble yo, wxDouble xc, wxDouble yc, wxDouble radius,
+wxGraphicsBrush wxCairoRenderer::CreateRadialGradientBrush( wxDouble xo, wxDouble yo, wxDouble xc, wxDouble yc, wxDouble radius,
const wxColour &oColor, const wxColour &cColor)
{
- wxCairoBrush* brush = new wxCairoBrush(this);
- brush->CreateRadialGradientBrush(xo,yo,xc,yc,radius,oColor,cColor);
- return brush;
+ wxGraphicsBrush p;
+ wxCairoBrushData* d = new wxCairoBrushData( this );
+ d->CreateRadialGradientBrush(xo,yo,xc,yc,radius,oColor,cColor);
+ p.SetRefData(d);
+ return p;
}
// sets the font
-wxGraphicsFont* wxCairoRenderer::CreateFont( const wxFont &font , const wxColour &col )
+wxGraphicsFont wxCairoRenderer::CreateFont( const wxFont &font , const wxColour &col )
{
if ( font.Ok() )
- return new wxCairoFont( this , font, col );
+ {
+ wxGraphicsFont p;
+ p.SetRefData(new wxCairoFontData( this , font, col ));
+ return p;
+ }
else
- return NULL;
+ return wxNullGraphicsFont;
}
#endif // wxUSE_GRAPHICS_CONTEXT
projects / wxWidgets.git / blobdiff