#include "wx/wxprec.h"
-#include "wx/dc.h"
-
#ifdef __BORLANDC__
#pragma hdrstop
#endif
+#if wxUSE_GRAPHICS_CONTEXT
+
+#include "wx/dc.h"
+
#ifndef WX_PRECOMP
#include "wx/image.h"
#include "wx/window.h"
#include "wx/module.h"
#endif
-#ifdef __WXGTK__
-#include "wx/gtk/win_gtk.h"
-#endif
-
#include "wx/graphics.h"
-
-#if wxUSE_GRAPHICS_CONTEXT
+#include "wx/rawbmp.h"
#include <vector>
#include <cairo.h>
#ifdef __WXGTK__
#include <gtk/gtk.h>
+#include "wx/fontutil.h"
#endif
-class WXDLLIMPEXP_CORE wxCairoPath : public wxGraphicsPath
+#ifdef __WXMSW__
+#include <cairo-win32.h>
+#endif
+
+#ifdef __WXMAC__
+#include "wx/mac/private.h"
+#include <cairo-quartz.h>
+#include <cairo-atsui.h>
+#endif
+
+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() ;
-
- wxCairoMatrix(wxGraphicsRenderer* renderer, const cairo_matrix_t* matrix = NULL ) ;
- virtual ~wxCairoMatrix() ;
+ wxCairoMatrixData(wxGraphicsRenderer* renderer, const cairo_matrix_t* matrix = NULL ) ;
+ virtual ~wxCairoMatrixData() ;
- 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 );
+#ifdef __WXGTK__
+ const PangoFontDescription* GetFont() const { return m_font; }
+#endif
private :
- wxCharBuffer m_fontName;
double m_size;
- cairo_font_slant_t m_slant;
- cairo_font_weight_t m_weight;
double m_red;
double m_green;
double m_blue;
double m_alpha;
- DECLARE_DYNAMIC_CLASS_NO_COPY(wxCairoFont)
+#ifdef __WXMAC__
+ cairo_font_face_t *m_font;
+#elif defined(__WXGTK__)
+ PangoFontDescription* m_font;
+#else
+ wxCharBuffer m_fontName;
+ cairo_font_slant_t m_slant;
+ cairo_font_weight_t m_weight;
+#endif
};
class WXDLLIMPEXP_CORE wxCairoContext : public wxGraphicsContext
wxCairoContext();
virtual ~wxCairoContext();
+ virtual bool ShouldOffset() const
+ {
+ int penwidth = 0 ;
+ if ( !m_pen.IsNull() )
+ {
+ penwidth = (int)((wxCairoPenData*)m_pen.GetRefData())->GetWidth();
+ if ( penwidth == 0 )
+ penwidth = 1;
+ }
+ return ( penwidth % 2 ) == 1;
+ }
+
virtual void Clip( const wxRegion ®ion );
// clips drawings to the rect
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 );
virtual void GetPartialTextExtents(const wxString& text, wxArrayDouble& widths) const;
private:
+ void Init(cairo_t *context);
+
cairo_t* m_context;
};
//-----------------------------------------------------------------------------
-// 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;
break;
case wxLONG_DASH :
- m_lengths = dotted ;
+ m_lengths = dashed ;
m_count = WXSIZEOF(dashed);
break;
case wxSHORT_DASH :
- m_lengths = dotted ;
+ m_lengths = short_dashed ;
m_count = WXSIZEOF(short_dashed);
break;
case wxDOT_DASH :
- m_lengths = dotted ;
+ m_lengths = dotted_dashed ;
m_count = WXSIZEOF(dotted_dashed);
break;
}
}
-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_blue = col.Blue()/255.0;
m_alpha = col.Alpha()/255.0;
-
m_size = font.GetPointSize();
+
+#ifdef __WXMAC__
+ m_font = cairo_atsui_font_face_create_for_atsu_font_id( font.MacGetATSUFontID() );
+#elif defined(__WXGTK__)
+ m_font = pango_font_description_copy( font.GetNativeFontInfo()->description );
+#else
m_fontName = font.GetFaceName().mb_str(wxConvUTF8);
m_slant = font.GetStyle() == wxFONTSTYLE_ITALIC ? CAIRO_FONT_SLANT_ITALIC:CAIRO_FONT_SLANT_NORMAL;
m_weight = font.GetWeight() == wxFONTWEIGHT_BOLD ? CAIRO_FONT_WEIGHT_BOLD:CAIRO_FONT_WEIGHT_NORMAL;
+#endif
}
-wxCairoFont::~wxCairoFont()
+wxCairoFontData::~wxCairoFontData()
{
+#ifdef __WXMAC__
+ cairo_font_face_destroy( m_font );
+#elif defined(__WXGTK__)
+ pango_font_description_free( m_font );
+#else
+#endif
}
-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);
- cairo_select_font_face(ctext,m_fontName,m_slant,m_weight);
- cairo_set_font_size(ctext,m_size);
- // TODO UNDERLINE
- // TODO FIX SIZE
+#ifdef __WXGTK__
+ // the rest is done using Pango layouts
+#elif defined(__WXMAC__)
+ cairo_set_font_face(ctext, m_font);
+ cairo_set_font_size(ctext, m_size );
+#else
+ cairo_select_font_face(ctext, m_fontName, m_slant, m_weights );
+ cairo_set_font_size(ctext, m_size );
+#endif
}
//-----------------------------------------------------------------------------
-// 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
+ cairo_path_t* p = (cairo_path_t*)path->GetNativePath();
+ cairo_append_path(m_pathContext, p);
+ UnGetNativePath(p);
}
-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 WXUNUSED(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 implementation
//-----------------------------------------------------------------------------
+class wxCairoOffsetHelper
+{
+public :
+ wxCairoOffsetHelper( cairo_t* ctx , bool offset )
+ {
+ m_ctx = ctx;
+ m_offset = offset;
+ if ( m_offset )
+ cairo_translate( m_ctx, 0.5, 0.5 );
+ }
+ ~wxCairoOffsetHelper( )
+ {
+ if ( m_offset )
+ cairo_translate( m_ctx, -0.5, -0.5 );
+ }
+public :
+ cairo_t* m_ctx;
+ bool m_offset;
+} ;
+
wxCairoContext::wxCairoContext( wxGraphicsRenderer* renderer, const wxWindowDC& dc )
: wxGraphicsContext(renderer)
{
#ifdef __WXGTK__
- m_context = gdk_cairo_create( dc.m_window ) ;
+#if wxUSE_NEW_DC
+ wxGTKImplDC *impldc = (wxGTKImplDC*) dc.GetImpl();
+ Init( gdk_cairo_create( impldc->GetGDKWindow() ) );
+#else
+ Init( gdk_cairo_create( dc.m_window ) );
+#endif
+#endif
+#ifdef __WXMAC__
+ int width, height;
+ dc.GetSize( &width, &height );
+ CGContextRef cgcontext = (CGContextRef)dc.GetWindow()->MacGetCGContextRef();
+ cairo_surface_t* surface = cairo_quartz_surface_create_for_cg_context(cgcontext, width, height);
+ Init( cairo_create( surface ) );
+ cairo_surface_destroy( surface );
#endif
- PushState();
- PushState();
}
#ifdef __WXGTK__
wxCairoContext::wxCairoContext( wxGraphicsRenderer* renderer, GdkDrawable *drawable )
: wxGraphicsContext(renderer)
{
- m_context = gdk_cairo_create( drawable ) ;
- PushState();
- PushState();
+ Init( gdk_cairo_create( drawable ) );
}
#endif
wxCairoContext::wxCairoContext( wxGraphicsRenderer* renderer, cairo_t *context )
: wxGraphicsContext(renderer)
{
- m_context = context ;
- PushState();
- PushState();
+ Init( context );
}
wxCairoContext::wxCairoContext( wxGraphicsRenderer* renderer, wxWindow *window)
#ifdef __WXGTK__
// something along these lines (copied from dcclient)
- GtkWidget *widget = window->m_wxwindow;
-
// Some controls don't have m_wxwindow - like wxStaticBox, but the user
// code should still be able to create wxClientDCs for them, so we will
// use the parent window here then.
- if ( !widget )
+ if (window->m_wxwindow == NULL)
{
window = window->GetParent();
- widget = window->m_wxwindow;
}
- wxASSERT_MSG( widget, wxT("wxCairoContext needs a widget") );
+ wxASSERT_MSG( window->m_wxwindow, wxT("wxCairoContext needs a widget") );
- GtkPizza *pizza = GTK_PIZZA( widget );
- GdkDrawable* drawable = pizza->bin_window;
- m_context = gdk_cairo_create( drawable ) ;
+ Init(gdk_cairo_create(window->GTKGetDrawingWindow()));
#endif
- PushState();
- PushState();
}
wxCairoContext::~wxCairoContext()
{
- SetPen(NULL);
- SetBrush(NULL);
- SetFont(NULL);
-
if ( m_context )
{
PopState();
}
}
+void wxCairoContext::Init(cairo_t *context)
+{
+ m_context = context ;
+ PushState();
+ PushState();
+}
+
-void wxCairoContext::Clip( const wxRegion & WXUNUSED(region) )
+void wxCairoContext::Clip( const wxRegion& region )
{
-// TODO
+ // Create a path with all the rectangles in the region
+ wxGraphicsPath path = GetRenderer()->CreatePath();
+ wxRegionIterator ri(region);
+ while (ri)
+ {
+ path.AddRectangle(ri.GetX(), ri.GetY(), ri.GetW(), ri.GetH());
+ ++ri;
+ }
+
+ // Put it in the context
+ cairo_path_t* cp = (cairo_path_t*) path.GetNativePath() ;
+ cairo_append_path(m_context, cp);
+
+ // clip to that path
+ cairo_clip(m_context);
+ path.UnGetNativePath(cp);
}
void wxCairoContext::Clip( wxDouble x, wxDouble y, wxDouble w, wxDouble h )
{
-// TODO
+ // Create a path with this rectangle
+ wxGraphicsPath path = GetRenderer()->CreatePath();
+ path.AddRectangle(x,y,w,h);
+
+ // Put it in the context
+ cairo_path_t* cp = (cairo_path_t*) path.GetNativePath() ;
+ cairo_append_path(m_context, cp);
+
+ // clip to that path
+ cairo_clip(m_context);
+ path.UnGetNativePath(cp);
}
void wxCairoContext::ResetClip()
{
-// TODO
+ cairo_reset_clip(m_context);
}
-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() ;
+ wxCairoOffsetHelper helper( m_context, ShouldOffset() ) ;
+ 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() ;
+ wxCairoOffsetHelper helper( m_context, ShouldOffset() ) ;
+ 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::DrawBitmap( const wxBitmap &bmp, wxDouble x, wxDouble y, wxDouble w, wxDouble h )
{
- /*
- Bitmap* image = Bitmap::FromHBITMAP((HBITMAP)bmp.GetHBITMAP(),(HPALETTE)bmp.GetPalette()->GetHPALETTE());
- m_context->DrawImage(image,(REAL) x,(REAL) y,(REAL) w,(REAL) h) ;
- delete image ;
- */
+ wxCHECK_RET( bmp.IsOk(), wxT("Invalid bitmap in wxCairoContext::DrawBitmap"));
+
+ cairo_surface_t* surface;
+ int bw = bmp.GetWidth();
+ int bh = bmp.GetHeight();
+ wxBitmap bmpSource = bmp; // we need a non-const instance
+ unsigned char* buffer = new unsigned char[bw*bh*4];
+ wxUint32* data = (wxUint32*)buffer;
+
+ // Create a surface object and copy the bitmap pixel data to it. if the
+ // image has alpha (or a mask represented as alpha) then we'll use a
+ // different format and iterator than if it doesn't...
+ if (bmpSource.HasAlpha() || bmpSource.GetMask())
+ {
+ surface = cairo_image_surface_create_for_data(
+ buffer, CAIRO_FORMAT_ARGB32, bw, bh, bw*4);
+ wxAlphaPixelData pixData(bmpSource, wxPoint(0,0), wxSize(bw, bh));
+ wxCHECK_RET( pixData, wxT("Failed to gain raw access to bitmap data."));
+
+ wxAlphaPixelData::Iterator p(pixData);
+ for (int y=0; y<bh; y++)
+ {
+ wxAlphaPixelData::Iterator rowStart = p;
+ for (int x=0; x<bw; x++)
+ {
+ // Each pixel in CAIRO_FORMAT_ARGB32 is a 32-bit quantity,
+ // with alpha in the upper 8 bits, then red, then green, then
+ // blue. The 32-bit quantities are stored native-endian.
+ // Pre-multiplied alpha is used.
+ unsigned char alpha = p.Alpha();
+ if (alpha == 0)
+ *data = 0;
+ else
+ *data = ( alpha << 24
+ | (p.Red() * alpha/255) << 16
+ | (p.Green() * alpha/255) << 8
+ | (p.Blue() * alpha/255) );
+ ++data;
+ ++p;
+ }
+ p = rowStart;
+ p.OffsetY(pixData, 1);
+ }
+ }
+ else // no alpha
+ {
+ surface = cairo_image_surface_create_for_data(
+ buffer, CAIRO_FORMAT_RGB24, bw, bh, bw*4);
+ wxNativePixelData pixData(bmpSource, wxPoint(0,0), wxSize(bw, bh));
+ wxCHECK_RET( pixData, wxT("Failed to gain raw access to bitmap data."));
+
+ wxNativePixelData::Iterator p(pixData);
+ for (int y=0; y<bh; y++)
+ {
+ wxNativePixelData::Iterator rowStart = p;
+ for (int x=0; x<bw; x++)
+ {
+ // Each pixel in CAIRO_FORMAT_RGB24 is a 32-bit quantity, with
+ // the upper 8 bits unused. Red, Green, and Blue are stored in
+ // the remaining 24 bits in that order. The 32-bit quantities
+ // are stored native-endian.
+ *data = ( p.Red() << 16 | p.Green() << 8 | p.Blue() );
+ ++data;
+ ++p;
+ }
+ p = rowStart;
+ p.OffsetY(pixData, 1);
+ }
+ }
+
+
+ PushState();
+
+ // In case we're scaling the image by using a width and height different
+ // than the bitmap's size create a pattern transformation on the surface and
+ // draw the transformed pattern.
+ cairo_pattern_t* pattern = cairo_pattern_create_for_surface(surface);
+ wxDouble scaleX = w / bw;
+ wxDouble scaleY = h / bh;
+ cairo_scale(m_context, scaleX, scaleY);
+
+ // prepare to draw the image
+ cairo_translate(m_context, x, y);
+ cairo_set_source(m_context, pattern);
+ // use the original size here since the context is scaled already...
+ cairo_rectangle(m_context, 0, 0, bw, bh);
+ // fill the rectangle using the pattern
+ cairo_fill(m_context);
+
+ // clean up
+ cairo_pattern_destroy(pattern);
+ cairo_surface_destroy(surface);
+ delete [] buffer;
+ PopState();
}
void wxCairoContext::DrawIcon( const wxIcon &icon, wxDouble x, wxDouble y, wxDouble w, wxDouble h )
{
- /*
- Bitmap* image = Bitmap::FromHICON((HICON)icon.GetHICON());
- m_context->DrawImage(image,(REAL) x,(REAL) y,(REAL) w,(REAL) h) ;
- delete image ;
- */
+ // An icon is a bitmap on wxGTK, so do this the easy way. When we want to
+ // start using the Cairo backend on other platforms then we may need to
+ // fiddle with this...
+ DrawBitmap(icon, x, y, w, h);
}
void wxCairoContext::DrawText( const wxString &str, wxDouble x, wxDouble y )
{
- if ( m_font == NULL || str.IsEmpty())
- return ;
- cairo_move_to(m_context,x,y);
+ if ( m_font.IsNull() || str.empty())
+ return;
+
+#ifdef __WXGTK__
+ const wxCharBuffer data = str.utf8_str();
+ if ( !data )
+ return;
+ size_t datalen = strlen(data);
+ ((wxCairoFontData*)m_font.GetRefData())->Apply(this);
+
+ PangoLayout *layout = pango_cairo_create_layout (m_context);
+ pango_layout_set_font_description( layout, ((wxCairoFontData*)m_font.GetRefData())->GetFont());
+ pango_layout_set_text(layout, data, datalen);
+ cairo_move_to(m_context, x, y);
+ pango_cairo_show_layout (m_context, layout);
+
+ g_object_unref (layout);
+#else
+ ((wxCairoFontData*)m_font.GetRefData())->Apply(this);
+ // Cairo's x,y for drawing text is at the baseline, so we need to adjust
+ // the position we move to by the ascent.
+ cairo_font_extents_t fe;
+ cairo_font_extents(m_context, &fe);
+ cairo_move_to(m_context, x, y+fe.ascent);
+
const wxWX2MBbuf buf(str.mb_str(wxConvUTF8));
- m_font->Apply(this);
cairo_show_text(m_context,buf);
+#endif
}
void wxCairoContext::GetTextExtent( const wxString &str, wxDouble *width, wxDouble *height,
wxDouble *descent, wxDouble *externalLeading ) const
{
- // TODO
+ if ( width )
+ *width = 0;
+ if ( height )
+ *height = 0;
+ if ( descent )
+ *descent = 0;
+ if ( externalLeading )
+ *externalLeading = 0;
+
+ if ( m_font.IsNull() || str.empty())
+ return;
+
+#ifdef __WXGTK__
+ int w, h;
+
+ PangoLayout *layout = pango_cairo_create_layout (m_context);
+ pango_layout_set_font_description( layout, ((wxCairoFontData*)m_font.GetRefData())->GetFont());
+ const wxCharBuffer data = str.utf8_str();
+ if ( !data )
+ {
+ return;
+ }
+ pango_layout_set_text( layout, data, strlen(data) );
+ pango_layout_get_pixel_size (layout, &w, &h);
+ if ( width )
+ *width = w;
+ if ( height )
+ *height = h;
+ if (descent)
+ {
+ PangoLayoutIter *iter = pango_layout_get_iter(layout);
+ int baseline = pango_layout_iter_get_baseline(iter);
+ pango_layout_iter_free(iter);
+ *descent = h - PANGO_PIXELS(baseline);
+ }
+ g_object_unref (layout);
+#else
+ ((wxCairoFontData*)m_font.GetRefData())->Apply((wxCairoContext*)this);
+
+ if (width)
+ {
+ const wxWX2MBbuf buf(str.mb_str(wxConvUTF8));
+ cairo_text_extents_t te;
+ cairo_text_extents(m_context, buf, &te);
+ *width = te.width;
+ }
+
+ if (height || descent || externalLeading)
+ {
+ cairo_font_extents_t fe;
+ cairo_font_extents(m_context, &fe);
+
+ // some backends have negative descents
+
+ if ( fe.descent < 0 )
+ fe.descent = -fe.descent;
+
+ if ( fe.height < (fe.ascent + fe.descent ) )
+ {
+ // some backends are broken re height ... (eg currently ATSUI)
+ fe.height = fe.ascent + fe.descent;
+ }
+
+ if (height)
+ *height = fe.height;
+ if ( descent )
+ *descent = fe.descent;
+ if ( externalLeading )
+ *externalLeading = wxMax(0, fe.height - (fe.ascent + fe.descent));
+ }
+#endif
}
void wxCairoContext::GetPartialTextExtents(const wxString& text, wxArrayDouble& widths) const
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)
IMPLEMENT_DYNAMIC_CLASS(wxCairoRenderer,wxGraphicsRenderer)
static wxCairoRenderer gs_cairoGraphicsRenderer;
+// temporary hack to allow creating a cairo context on any platform
+extern wxGraphicsRenderer* gCairoRenderer;
+wxGraphicsRenderer* gCairoRenderer = &gs_cairoGraphicsRenderer;
#ifdef __WXGTK__
wxGraphicsRenderer* wxGraphicsRenderer::GetDefaultRenderer()
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