int m_hatch;
};
-class wxMacCoreGraphicsPen : public wxGraphicsPen
+class wxMacCoreGraphicsPenData : public wxGraphicsObjectRefData
{
public:
- wxMacCoreGraphicsPen();
- wxMacCoreGraphicsPen( wxGraphicsRenderer* renderer, const wxPen &pen );
- ~wxMacCoreGraphicsPen();
+ wxMacCoreGraphicsPenData( wxGraphicsRenderer* renderer, const wxPen &pen );
+ ~wxMacCoreGraphicsPenData();
void Init();
virtual void Apply( wxGraphicsContext* context );
bool m_isPattern;
wxMacCFRefHolder<CGPatternRef> m_pattern;
CGFloat* m_patternColorComponents;
-private :
-DECLARE_DYNAMIC_CLASS_NO_COPY(wxMacCoreGraphicsPen)
};
-IMPLEMENT_DYNAMIC_CLASS(wxMacCoreGraphicsPen,wxGraphicsPen)
-
-wxMacCoreGraphicsPen::wxMacCoreGraphicsPen() : wxGraphicsPen( NULL )
-{
- wxLogDebug(wxT("Illegal Constructor called"));
-}
-
-wxMacCoreGraphicsPen::wxMacCoreGraphicsPen( wxGraphicsRenderer* renderer, const wxPen &pen ) :
- wxGraphicsPen( renderer )
+wxMacCoreGraphicsPenData::wxMacCoreGraphicsPenData( wxGraphicsRenderer* renderer, const wxPen &pen ) :
+ wxGraphicsObjectRefData( renderer )
{
Init();
}
}
-wxMacCoreGraphicsPen::~wxMacCoreGraphicsPen()
+wxMacCoreGraphicsPenData::~wxMacCoreGraphicsPenData()
{
delete[] m_userLengths;
delete[] m_patternColorComponents;
}
-void wxMacCoreGraphicsPen::Init()
+void wxMacCoreGraphicsPenData::Init()
{
m_lengths = NULL;
m_userLengths = NULL;
m_isPattern = false;
}
-void wxMacCoreGraphicsPen::Apply( wxGraphicsContext* context )
+void wxMacCoreGraphicsPenData::Apply( wxGraphicsContext* context )
{
CGContextRef cg = (CGContextRef) context->GetNativeContext();
CGContextSetLineWidth( cg , m_width );
// Brush
//
-class wxMacCoreGraphicsBrush : public wxGraphicsBrush
+class wxMacCoreGraphicsBrushData : public wxGraphicsObjectRefData
{
public:
- wxMacCoreGraphicsBrush();
- wxMacCoreGraphicsBrush( wxGraphicsRenderer* renderer );
- wxMacCoreGraphicsBrush( wxGraphicsRenderer* renderer, const wxBrush &brush );
- ~wxMacCoreGraphicsBrush ();
+ wxMacCoreGraphicsBrushData( wxGraphicsRenderer* renderer );
+ wxMacCoreGraphicsBrushData( wxGraphicsRenderer* renderer, const wxBrush &brush );
+ ~wxMacCoreGraphicsBrushData ();
virtual void Apply( wxGraphicsContext* context );
void CreateLinearGradientBrush( wxDouble x1, wxDouble y1, wxDouble x2, wxDouble y2,
CGFunctionRef m_gradientFunction;
CGShadingRef m_shading;
CGFloat *m_gradientComponents;
-private :
-DECLARE_DYNAMIC_CLASS_NO_COPY(wxMacCoreGraphicsBrush)
};
-IMPLEMENT_DYNAMIC_CLASS(wxMacCoreGraphicsBrush,wxGraphicsBrush)
-
-wxMacCoreGraphicsBrush::wxMacCoreGraphicsBrush() : wxGraphicsBrush( NULL )
-{
- wxLogDebug(wxT("Illegal Constructor called"));
-}
-
-wxMacCoreGraphicsBrush::wxMacCoreGraphicsBrush( wxGraphicsRenderer* renderer) : wxGraphicsBrush( renderer )
+wxMacCoreGraphicsBrushData::wxMacCoreGraphicsBrushData( wxGraphicsRenderer* renderer) : wxGraphicsObjectRefData( renderer )
{
Init();
}
-void wxMacCoreGraphicsBrush::CreateLinearGradientBrush( wxDouble x1, wxDouble y1, wxDouble x2, wxDouble y2,
+void wxMacCoreGraphicsBrushData::CreateLinearGradientBrush( wxDouble x1, wxDouble y1, wxDouble x2, wxDouble y2,
const wxColour&c1, const wxColour&c2 )
{
m_gradientFunction = CreateGradientFunction( c1, c2 );
m_isShading = true ;
}
-void wxMacCoreGraphicsBrush::CreateRadialGradientBrush( wxDouble xo, wxDouble yo, wxDouble xc, wxDouble yc, wxDouble radius,
+void wxMacCoreGraphicsBrushData::CreateRadialGradientBrush( wxDouble xo, wxDouble yo, wxDouble xc, wxDouble yc, wxDouble radius,
const wxColour &oColor, const wxColour &cColor )
{
m_gradientFunction = CreateGradientFunction( oColor, cColor );
m_isShading = true ;
}
-wxMacCoreGraphicsBrush::wxMacCoreGraphicsBrush(wxGraphicsRenderer* renderer, const wxBrush &brush) : wxGraphicsBrush( renderer )
+wxMacCoreGraphicsBrushData::wxMacCoreGraphicsBrushData(wxGraphicsRenderer* renderer, const wxBrush &brush) : wxGraphicsObjectRefData( renderer )
{
Init();
}
}
-wxMacCoreGraphicsBrush::~wxMacCoreGraphicsBrush()
+wxMacCoreGraphicsBrushData::~wxMacCoreGraphicsBrushData()
{
if ( m_shading )
CGShadingRelease(m_shading);
delete[] m_patternColorComponents;
}
-void wxMacCoreGraphicsBrush::Init()
+void wxMacCoreGraphicsBrushData::Init()
{
m_patternColorComponents = NULL;
m_gradientFunction = NULL;
m_isShading = false;
}
-void wxMacCoreGraphicsBrush::Apply( wxGraphicsContext* context )
+void wxMacCoreGraphicsBrushData::Apply( wxGraphicsContext* context )
{
CGContextRef cg = (CGContextRef) context->GetNativeContext();
}
}
-void wxMacCoreGraphicsBrush::CalculateShadingValues (void *info, const CGFloat *in, CGFloat *out)
+void wxMacCoreGraphicsBrushData::CalculateShadingValues (void *info, const CGFloat *in, CGFloat *out)
{
CGFloat* colors = (CGFloat*) info ;
CGFloat f = *in;
}
}
-CGFunctionRef wxMacCoreGraphicsBrush::CreateGradientFunction( const wxColour& c1, const wxColour& c2 )
+CGFunctionRef wxMacCoreGraphicsBrushData::CreateGradientFunction( const wxColour& c1, const wxColour& c2 )
{
static const CGFunctionCallbacks callbacks = { 0, &CalculateShadingValues, NULL };
static const CGFloat input_value_range [2] = { 0, 1 };
// Font
//
-class wxMacCoreGraphicsFont : public wxGraphicsFont
+class wxMacCoreGraphicsFontData : public wxGraphicsObjectRefData
{
public:
- wxMacCoreGraphicsFont();
- wxMacCoreGraphicsFont( wxGraphicsRenderer* renderer, const wxFont &font, const wxColour& col );
- ~wxMacCoreGraphicsFont();
+ wxMacCoreGraphicsFontData( wxGraphicsRenderer* renderer, const wxFont &font, const wxColour& col );
+ ~wxMacCoreGraphicsFontData();
- virtual void Apply( wxGraphicsContext* context );
virtual ATSUStyle GetATSUStyle() { return m_macATSUIStyle; }
private :
ATSUStyle m_macATSUIStyle;
-DECLARE_DYNAMIC_CLASS_NO_COPY(wxMacCoreGraphicsFont)
};
-IMPLEMENT_DYNAMIC_CLASS(wxMacCoreGraphicsFont,wxGraphicsFont)
-
-wxMacCoreGraphicsFont::wxMacCoreGraphicsFont() : wxGraphicsFont( NULL )
-{
- wxLogDebug(wxT("Illegal Constructor called"));
-}
-
-wxMacCoreGraphicsFont::wxMacCoreGraphicsFont(wxGraphicsRenderer* renderer, const wxFont &font, const wxColour& col) : wxGraphicsFont( renderer )
+wxMacCoreGraphicsFontData::wxMacCoreGraphicsFontData(wxGraphicsRenderer* renderer, const wxFont &font, const wxColour& col) : wxGraphicsObjectRefData( renderer )
{
m_macATSUIStyle = NULL;
wxASSERT_MSG( status == noErr , wxT("couldn't modify ATSU style") );
}
-wxMacCoreGraphicsFont::~wxMacCoreGraphicsFont()
+wxMacCoreGraphicsFontData::~wxMacCoreGraphicsFontData()
{
if ( m_macATSUIStyle )
{
}
}
-void wxMacCoreGraphicsFont::Apply( wxGraphicsContext* WXUNUSED(context) )
-{
- // nothing to do here
-}
-
//
// Graphics Matrix
//
// wxMacCoreGraphicsMatrix declaration
//-----------------------------------------------------------------------------
-class WXDLLIMPEXP_CORE wxMacCoreGraphicsMatrix : public wxGraphicsMatrix
+class WXDLLIMPEXP_CORE wxMacCoreGraphicsMatrixData : public wxGraphicsMatrixData
{
public :
- wxMacCoreGraphicsMatrix() ;
-
- wxMacCoreGraphicsMatrix(wxGraphicsRenderer* renderer, wxDouble a=1.0, wxDouble b=0.0, wxDouble c=0.0, wxDouble d=1.0,
- wxDouble tx=0.0, wxDouble ty=0.0) ;
+ wxMacCoreGraphicsMatrixData(wxGraphicsRenderer* renderer) ;
- virtual ~wxMacCoreGraphicsMatrix() ;
+ virtual ~wxMacCoreGraphicsMatrixData() ;
- virtual wxGraphicsMatrix *Clone() const ;
+ virtual wxGraphicsObjectRefData *Clone() const ;
// concatenates the matrix
- virtual void Concat( const wxGraphicsMatrix *t );
+ virtual void Concat( const wxGraphicsMatrixData *t );
- // copies the passed in matrix
- virtual void Copy( const wxGraphicsMatrix *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);
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 :
CGAffineTransform m_matrix;
-
- DECLARE_DYNAMIC_CLASS_NO_COPY(wxMacCoreGraphicsMatrix)
} ;
//-----------------------------------------------------------------------------
// wxMacCoreGraphicsMatrix implementation
//-----------------------------------------------------------------------------
-IMPLEMENT_DYNAMIC_CLASS(wxMacCoreGraphicsMatrix, wxGraphicsMatrix)
-
-wxMacCoreGraphicsMatrix::wxMacCoreGraphicsMatrix() : wxGraphicsMatrix(NULL)
+wxMacCoreGraphicsMatrixData::wxMacCoreGraphicsMatrixData(wxGraphicsRenderer* renderer) : wxGraphicsMatrixData(renderer)
{
- wxLogDebug(wxT("Illegal Constructor called"));
}
-wxMacCoreGraphicsMatrix::wxMacCoreGraphicsMatrix(wxGraphicsRenderer* renderer, wxDouble a, wxDouble b, wxDouble c, wxDouble d,
- wxDouble tx, wxDouble ty) : wxGraphicsMatrix(renderer)
+wxMacCoreGraphicsMatrixData::~wxMacCoreGraphicsMatrixData()
{
- m_matrix = CGAffineTransformMake(a,b,c,d,tx,ty);
}
-wxMacCoreGraphicsMatrix::~wxMacCoreGraphicsMatrix()
+wxGraphicsObjectRefData *wxMacCoreGraphicsMatrixData::Clone() const
{
-}
-
-wxGraphicsMatrix *wxMacCoreGraphicsMatrix::Clone() const
-{
- wxMacCoreGraphicsMatrix* m = new wxMacCoreGraphicsMatrix(GetRenderer()) ;
+ wxMacCoreGraphicsMatrixData* m = new wxMacCoreGraphicsMatrixData(GetRenderer()) ;
m->m_matrix = m_matrix ;
return m;
}
// concatenates the matrix
-void wxMacCoreGraphicsMatrix::Concat( const wxGraphicsMatrix *t )
+void wxMacCoreGraphicsMatrixData::Concat( const wxGraphicsMatrixData *t )
{
m_matrix = CGAffineTransformConcat(m_matrix, *((CGAffineTransform*) t->GetNativeMatrix()) );
}
-// copies the passed in matrix
-void wxMacCoreGraphicsMatrix::Copy( const wxGraphicsMatrix *t )
-{
- m_matrix = *((CGAffineTransform*) t->GetNativeMatrix());
-}
-
// sets the matrix to the respective values
-void wxMacCoreGraphicsMatrix::Set(wxDouble a, wxDouble b, wxDouble c, wxDouble d,
+void wxMacCoreGraphicsMatrixData::Set(wxDouble a, wxDouble b, wxDouble c, wxDouble d,
wxDouble tx, wxDouble ty)
{
m_matrix = CGAffineTransformMake(a,b,c,d,tx,ty);
}
// makes this the inverse matrix
-void wxMacCoreGraphicsMatrix::Invert()
+void wxMacCoreGraphicsMatrixData::Invert()
{
m_matrix = CGAffineTransformInvert( m_matrix );
}
// returns true if the elements of the transformation matrix are equal ?
-bool wxMacCoreGraphicsMatrix::IsEqual( const wxGraphicsMatrix* t) const
+bool wxMacCoreGraphicsMatrixData::IsEqual( const wxGraphicsMatrixData* t) const
{
const CGAffineTransform* tm = (CGAffineTransform*) t->GetNativeMatrix();
return (
}
// return true if this is the identity matrix
-bool wxMacCoreGraphicsMatrix::IsIdentity()
+bool wxMacCoreGraphicsMatrixData::IsIdentity() const
{
return ( m_matrix.a == 1 && m_matrix.d == 1 &&
m_matrix.b == 0 && m_matrix.d == 0 && m_matrix.tx == 0 && m_matrix.ty == 0);
//
// add the translation to this matrix
-void wxMacCoreGraphicsMatrix::Translate( wxDouble dx , wxDouble dy )
+void wxMacCoreGraphicsMatrixData::Translate( wxDouble dx , wxDouble dy )
{
m_matrix = CGAffineTransformTranslate( m_matrix, dx, dy);
}
// add the scale to this matrix
-void wxMacCoreGraphicsMatrix::Scale( wxDouble xScale , wxDouble yScale )
+void wxMacCoreGraphicsMatrixData::Scale( wxDouble xScale , wxDouble yScale )
{
m_matrix = CGAffineTransformScale( m_matrix, xScale, yScale);
}
// add the rotation to this matrix (radians)
-void wxMacCoreGraphicsMatrix::Rotate( wxDouble angle )
+void wxMacCoreGraphicsMatrixData::Rotate( wxDouble angle )
{
m_matrix = CGAffineTransformRotate( m_matrix, angle);
}
//
// applies that matrix to the point
-void wxMacCoreGraphicsMatrix::TransformPoint( wxDouble *x, wxDouble *y )
+void wxMacCoreGraphicsMatrixData::TransformPoint( wxDouble *x, wxDouble *y ) const
{
CGPoint pt = CGPointApplyAffineTransform( CGPointMake(*x,*y), m_matrix);
}
// applies the matrix except for translations
-void wxMacCoreGraphicsMatrix::TransformDistance( wxDouble *dx, wxDouble *dy )
+void wxMacCoreGraphicsMatrixData::TransformDistance( wxDouble *dx, wxDouble *dy ) const
{
CGSize sz = CGSizeApplyAffineTransform( CGSizeMake(*dx,*dy) , m_matrix );
*dx = sz.width;
}
// returns the native representation
-void * wxMacCoreGraphicsMatrix::GetNativeMatrix() const
+void * wxMacCoreGraphicsMatrixData::GetNativeMatrix() const
{
return (void*) &m_matrix;
}
// wxMacCoreGraphicsPath declaration
//-----------------------------------------------------------------------------
-class WXDLLEXPORT wxMacCoreGraphicsPath : public wxGraphicsPath
+class WXDLLEXPORT wxMacCoreGraphicsPathData : public wxGraphicsPathData
{
public :
- wxMacCoreGraphicsPath( wxGraphicsRenderer* renderer, CGMutablePathRef path = NULL);
+ wxMacCoreGraphicsPathData( wxGraphicsRenderer* renderer, CGMutablePathRef path = NULL);
- wxMacCoreGraphicsPath();
-
- ~wxMacCoreGraphicsPath();
+ ~wxMacCoreGraphicsPathData();
- virtual wxGraphicsPath *Clone() const;
+ virtual wxGraphicsObjectRefData *Clone() const;
// begins a new subpath at (x,y)
virtual void MoveToPoint( wxDouble x, wxDouble y );
virtual void CloseSubpath();
// 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 an arc of a circle centering at (x,y) with radius (r) from startAngle to endAngle
virtual void AddArc( wxDouble x, wxDouble y, wxDouble r, wxDouble startAngle, wxDouble endAngle, bool clockwise );
virtual void AddArcToPoint( wxDouble x1, wxDouble y1 , wxDouble x2, wxDouble y2, wxDouble r );
// adds another path
- virtual void AddPath( const wxGraphicsPath* path );
+ virtual void AddPath( const wxGraphicsPathData* path );
// returns the native path
virtual void * GetNativePath() const { return m_path; }
// 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 *y);
+ virtual void GetBox(wxDouble *x, wxDouble *y, wxDouble *w, wxDouble *y) const;
- virtual bool Contains( wxDouble x, wxDouble y, int fillStyle = wxWINDING_RULE);
- DECLARE_DYNAMIC_CLASS_NO_COPY(wxMacCoreGraphicsPath)
+ virtual bool Contains( wxDouble x, wxDouble y, int fillStyle = wxODDEVEN_RULE) const;
private :
CGMutablePathRef m_path;
};
// wxMacCoreGraphicsPath implementation
//-----------------------------------------------------------------------------
-IMPLEMENT_DYNAMIC_CLASS(wxMacCoreGraphicsPath, wxGraphicsPath)
-
-wxMacCoreGraphicsPath::wxMacCoreGraphicsPath() : wxGraphicsPath(NULL)
-{
- wxLogDebug(wxT("Illegal Constructor called"));
-}
-
-
-wxMacCoreGraphicsPath::wxMacCoreGraphicsPath( wxGraphicsRenderer* renderer, CGMutablePathRef path) : wxGraphicsPath(renderer)
+wxMacCoreGraphicsPathData::wxMacCoreGraphicsPathData( wxGraphicsRenderer* renderer, CGMutablePathRef path) : wxGraphicsPathData(renderer)
{
if ( path )
m_path = path;
m_path = CGPathCreateMutable();
}
-wxMacCoreGraphicsPath::~wxMacCoreGraphicsPath()
+wxMacCoreGraphicsPathData::~wxMacCoreGraphicsPathData()
{
CGPathRelease( m_path );
}
-wxGraphicsPath* wxMacCoreGraphicsPath::Clone() const
+wxGraphicsObjectRefData* wxMacCoreGraphicsPathData::Clone() const
{
- wxMacCoreGraphicsPath* clone = new wxMacCoreGraphicsPath(GetRenderer(),CGPathCreateMutableCopy(m_path));
+ wxMacCoreGraphicsPathData* clone = new wxMacCoreGraphicsPathData(GetRenderer(),CGPathCreateMutableCopy(m_path));
return clone ;
}
// opens (starts) a new subpath
-void wxMacCoreGraphicsPath::MoveToPoint( wxDouble x1 , wxDouble y1 )
+void wxMacCoreGraphicsPathData::MoveToPoint( wxDouble x1 , wxDouble y1 )
{
CGPathMoveToPoint( m_path , NULL , x1 , y1 );
}
-void wxMacCoreGraphicsPath::AddLineToPoint( wxDouble x1 , wxDouble y1 )
+void wxMacCoreGraphicsPathData::AddLineToPoint( wxDouble x1 , wxDouble y1 )
{
CGPathAddLineToPoint( m_path , NULL , x1 , y1 );
}
-void wxMacCoreGraphicsPath::AddCurveToPoint( wxDouble cx1, wxDouble cy1, wxDouble cx2, wxDouble cy2, wxDouble x, wxDouble y )
+void wxMacCoreGraphicsPathData::AddCurveToPoint( wxDouble cx1, wxDouble cy1, wxDouble cx2, wxDouble cy2, wxDouble x, wxDouble y )
{
CGPathAddCurveToPoint( m_path , NULL , cx1 , cy1 , cx2, cy2, x , y );
}
-void wxMacCoreGraphicsPath::AddQuadCurveToPoint( wxDouble cx1, wxDouble cy1, wxDouble x, wxDouble y )
+void wxMacCoreGraphicsPathData::AddQuadCurveToPoint( wxDouble cx1, wxDouble cy1, wxDouble x, wxDouble y )
{
CGPathAddQuadCurveToPoint( m_path , NULL , cx1 , cy1 , x , y );
}
-void wxMacCoreGraphicsPath::AddRectangle( wxDouble x, wxDouble y, wxDouble w, wxDouble h )
+void wxMacCoreGraphicsPathData::AddRectangle( wxDouble x, wxDouble y, wxDouble w, wxDouble h )
{
CGRect cgRect = { { x , y } , { w , h } };
CGPathAddRect( m_path , NULL , cgRect );
}
-void wxMacCoreGraphicsPath::AddCircle( wxDouble x, wxDouble y , wxDouble r )
+void wxMacCoreGraphicsPathData::AddCircle( wxDouble x, wxDouble y , wxDouble r )
{
CGPathAddArc( m_path , NULL , x , y , r , 0.0 , 2 * M_PI , true );
}
// adds an arc of a circle centering at (x,y) with radius (r) from startAngle to endAngle
-void wxMacCoreGraphicsPath::AddArc( wxDouble x, wxDouble y, wxDouble r, wxDouble startAngle, wxDouble endAngle, bool clockwise )
+void wxMacCoreGraphicsPathData::AddArc( wxDouble x, wxDouble y, wxDouble r, wxDouble startAngle, wxDouble endAngle, bool clockwise )
{
// inverse direction as we the 'normal' state is a y axis pointing down, ie mirrored to the standard core graphics setup
CGPathAddArc( m_path, NULL , x, y, r, startAngle, endAngle, !clockwise);
}
-void wxMacCoreGraphicsPath::AddArcToPoint( wxDouble x1, wxDouble y1 , wxDouble x2, wxDouble y2, wxDouble r )
+void wxMacCoreGraphicsPathData::AddArcToPoint( wxDouble x1, wxDouble y1 , wxDouble x2, wxDouble y2, wxDouble r )
{
CGPathAddArcToPoint( m_path, NULL , x1, y1, x2, y2, r);
}
-void wxMacCoreGraphicsPath::AddPath( const wxGraphicsPath* path )
+void wxMacCoreGraphicsPathData::AddPath( const wxGraphicsPathData* path )
{
CGPathAddPath( m_path , NULL, (CGPathRef) path->GetNativePath() );
}
// closes the current subpath
-void wxMacCoreGraphicsPath::CloseSubpath()
+void wxMacCoreGraphicsPathData::CloseSubpath()
{
CGPathCloseSubpath( m_path );
}
// gets the last point of the current path, (0,0) if not yet set
-void wxMacCoreGraphicsPath::GetCurrentPoint( wxDouble& x, wxDouble&y)
+void wxMacCoreGraphicsPathData::GetCurrentPoint( wxDouble* x, wxDouble* y) const
{
CGPoint p = CGPathGetCurrentPoint( m_path );
- x = p.x;
- y = p.y;
+ *x = p.x;
+ *y = p.y;
}
// transforms each point of this path by the matrix
-void wxMacCoreGraphicsPath::Transform( wxGraphicsMatrix* matrix )
+void wxMacCoreGraphicsPathData::Transform( const wxGraphicsMatrixData* matrix )
{
CGMutablePathRef p = CGPathCreateMutable() ;
CGPathAddPath( p, (CGAffineTransform*) matrix->GetNativeMatrix() , m_path );
}
// gets the bounding box enclosing all points (possibly including control points)
-void wxMacCoreGraphicsPath::GetBox(wxDouble *x, wxDouble *y, wxDouble *w, wxDouble *h)
+void wxMacCoreGraphicsPathData::GetBox(wxDouble *x, wxDouble *y, wxDouble *w, wxDouble *h) const
{
CGRect bounds = CGPathGetBoundingBox( m_path ) ;
*x = bounds.origin.x;
*h = bounds.size.height;
}
-bool wxMacCoreGraphicsPath::Contains( wxDouble x, wxDouble y, int fillStyle)
+bool wxMacCoreGraphicsPathData::Contains( wxDouble x, wxDouble y, int fillStyle) const
{
return CGPathContainsPoint( m_path, NULL, CGPointMake(x,y), fillStyle == wxODDEVEN_RULE );
}
-
-//
-// Graphics Pen
-//
-
-//-----------------------------------------------------------------------------
-// wxMacCoreGraphicsPen declaration
-//-----------------------------------------------------------------------------
-
-
//
// Graphics Context
//
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;
//
// setting the paint
//
- // sets the pen
- virtual void SetPen( wxGraphicsPen* pen , bool release = true );
-
- // sets the brush for filling
- virtual void SetBrush( wxGraphicsBrush* brush , bool release = true );
-
- // sets the font
- virtual void SetFont( wxGraphicsFont* font, bool release = true );
-
// strokes along a path with the current pen
- virtual void StrokePath( const wxGraphicsPath *path );
+ virtual void StrokePath( const wxGraphicsPath &path );
// fills a path with the current brush
- virtual void FillPath( const wxGraphicsPath *path, int fillStyle = wxWINDING_RULE );
+ virtual void FillPath( const wxGraphicsPath &path, int fillStyle = wxODDEVEN_RULE );
// draws a path by first filling and then stroking
- virtual void DrawPath( const wxGraphicsPath *path, int fillStyle = wxWINDING_RULE );
+ virtual void DrawPath( const wxGraphicsPath &path, int fillStyle = wxODDEVEN_RULE );
virtual bool ShouldOffset() const
{
int penwidth = 0 ;
- if ( m_pen )
+ if ( !m_pen.IsNull() )
{
- penwidth = m_pen->GetWidth();
+ penwidth = ((wxMacCoreGraphicsPenData*)m_pen.GetRefData())->GetWidth();
if ( penwidth == 0 )
penwidth = 1;
}
private:
void EnsureIsValid();
-
+
CGContextRef m_cgContext;
WindowRef m_windowRef;
- int m_originX;
- int m_originY;
- wxMacCFRefHolder<HIShapeRef> m_clipRgn;
bool m_releaseContext;
+ CGAffineTransform m_windowTransform;
+
+ wxMacCFRefHolder<HIShapeRef> m_clipRgn;
};
//-----------------------------------------------------------------------------
m_cgContext = NULL;
m_releaseContext = false;
m_windowRef = NULL;
- m_originX = 0;
- m_originY = 0;
+
HIRect r = CGRectMake(0,0,0,0);
m_clipRgn.Set(HIShapeCreateWithRect(&r));
}
wxMacCoreGraphicsContext::wxMacCoreGraphicsContext( wxGraphicsRenderer* renderer, CGContextRef cgcontext ) : wxGraphicsContext(renderer)
{
Init();
- m_cgContext = cgcontext;
- // FIXME: This check is needed because currently we need to use a DC/GraphicsContext
- // in order to get font properties, like wxFont::GetPixelSize, but since we don't have
- // a native window attached to use, I create a wxGraphicsContext with a NULL CGContextRef
- // for this one operation.
-
- // When wxFont::GetPixelSize on Mac no longer needs a graphics context, this check
- // can be removed.
- if (m_cgContext)
- {
- CGContextSaveGState( m_cgContext );
- CGContextSaveGState( m_cgContext );
- }
+ SetNativeContext(cgcontext);
}
wxMacCoreGraphicsContext::wxMacCoreGraphicsContext( wxGraphicsRenderer* renderer, WindowRef window ): wxGraphicsContext(renderer)
{
Init();
m_windowRef = (WindowRef) window->MacGetTopLevelWindowRef();
- m_originX = m_originY = 0;
- window->MacWindowToRootWindow( &m_originX , &m_originY );
+ int originX , originY;
+ originX = originY = 0;
+ window->MacWindowToRootWindow( &originX , &originY );
+ Rect bounds;
+ GetWindowBounds( m_windowRef, kWindowContentRgn, &bounds );
+
+ m_windowTransform = CGAffineTransformMakeTranslation( 0 , bounds.bottom - bounds.top );
+ m_windowTransform = CGAffineTransformScale( m_windowTransform , 1 , -1 );
+ m_windowTransform = CGAffineTransformTranslate( m_windowTransform, originX, originY ) ;
}
wxMacCoreGraphicsContext::wxMacCoreGraphicsContext(wxGraphicsRenderer* renderer) : wxGraphicsContext(renderer)
wxMacCoreGraphicsContext::~wxMacCoreGraphicsContext()
{
- SetPen(NULL);
- SetFont(NULL);
- SetBrush(NULL);
-
- if ( m_cgContext )
- {
- // TODO : when is this necessary - should we add a Flush() method ? CGContextSynchronize( m_cgContext );
- CGContextRestoreGState( m_cgContext );
- CGContextRestoreGState( m_cgContext );
- }
-
- if ( m_releaseContext )
- QDEndCGContext( GetWindowPort( m_windowRef ) , &m_cgContext);
+ SetNativeContext(NULL);
}
void wxMacCoreGraphicsContext::EnsureIsValid()
{
OSStatus status = QDBeginCGContext( GetWindowPort( m_windowRef ) , &m_cgContext );
wxASSERT_MSG( status == noErr , wxT("Cannot nest wxDCs on the same window") );
- Rect bounds;
- GetWindowBounds( m_windowRef, kWindowContentRgn, &bounds );
- CGContextSaveGState( m_cgContext );
- CGContextTranslateCTM( m_cgContext , 0 , bounds.bottom - bounds.top );
- CGContextScaleCTM( m_cgContext , 1 , -1 );
- CGContextTranslateCTM( m_cgContext, m_originX, m_originY );
+
+ CGContextConcatCTM( m_cgContext, m_windowTransform );
CGContextSaveGState( m_cgContext );
m_releaseContext = true;
if ( !HIShapeIsEmpty(m_clipRgn) )
}
}
-void wxMacCoreGraphicsContext::StrokePath( const wxGraphicsPath *path )
+void wxMacCoreGraphicsContext::StrokePath( const wxGraphicsPath &path )
{
- if ( m_pen == NULL )
+ if ( m_pen.IsNull() )
return ;
EnsureIsValid();
if ( offset )
CGContextTranslateCTM( m_cgContext, 0.5, 0.5 );
- m_pen->Apply(this);
- CGContextAddPath( m_cgContext , (CGPathRef) path->GetNativePath() );
+ ((wxMacCoreGraphicsPenData*)m_pen.GetRefData())->Apply(this);
+ CGContextAddPath( m_cgContext , (CGPathRef) path.GetNativePath() );
CGContextStrokePath( m_cgContext );
if ( offset )
CGContextTranslateCTM( m_cgContext, -0.5, -0.5 );
}
-void wxMacCoreGraphicsContext::DrawPath( const wxGraphicsPath *path , int fillStyle )
+void wxMacCoreGraphicsContext::DrawPath( const wxGraphicsPath &path , int fillStyle )
{
- if ( m_brush != NULL && ((wxMacCoreGraphicsBrush*)m_brush)->IsShading() )
+ if ( !m_brush.IsNull() && ((wxMacCoreGraphicsBrushData*)m_brush.GetRefData())->IsShading() )
{
// when using shading, we cannot draw pen and brush at the same time
// revert to the base implementation of first filling and then stroking
}
CGPathDrawingMode mode = kCGPathFill ;
- if ( m_brush == NULL )
+ if ( m_brush.IsNull() )
{
- if ( m_pen == NULL )
+ if ( m_pen.IsNull() )
return;
else
mode = kCGPathStroke;
}
else
{
- if ( m_pen == NULL )
+ if ( m_pen.IsNull() )
{
if ( fillStyle == wxODDEVEN_RULE )
mode = kCGPathEOFill;
EnsureIsValid();
- if ( m_brush )
- m_brush->Apply(this);
- if ( m_pen )
- m_pen->Apply(this);
+ if ( !m_brush.IsNull() )
+ ((wxMacCoreGraphicsBrushData*)m_brush.GetRefData())->Apply(this);
+ if ( !m_pen.IsNull() )
+ ((wxMacCoreGraphicsPenData*)m_pen.GetRefData())->Apply(this);
bool offset = ShouldOffset();
if ( offset )
CGContextTranslateCTM( m_cgContext, 0.5, 0.5 );
- CGContextAddPath( m_cgContext , (CGPathRef) path->GetNativePath() );
+ CGContextAddPath( m_cgContext , (CGPathRef) path.GetNativePath() );
CGContextDrawPath( m_cgContext , mode );
if ( offset )
CGContextTranslateCTM( m_cgContext, -0.5, -0.5 );
}
-void wxMacCoreGraphicsContext::FillPath( const wxGraphicsPath *path , int fillStyle )
+void wxMacCoreGraphicsContext::FillPath( const wxGraphicsPath &path , int fillStyle )
{
- if ( m_brush == NULL )
+ if ( m_brush.IsNull() )
return;
EnsureIsValid();
- if ( ((wxMacCoreGraphicsBrush*)m_brush)->IsShading() )
+ if ( ((wxMacCoreGraphicsBrushData*)m_brush.GetRefData())->IsShading() )
{
CGContextSaveGState( m_cgContext );
- CGContextAddPath( m_cgContext , (CGPathRef) path->GetNativePath() );
+ CGContextAddPath( m_cgContext , (CGPathRef) path.GetNativePath() );
CGContextClip( m_cgContext );
- CGContextDrawShading( m_cgContext, ((wxMacCoreGraphicsBrush*)m_brush)->GetShading() );
+ CGContextDrawShading( m_cgContext, ((wxMacCoreGraphicsBrushData*)m_brush.GetRefData())->GetShading() );
CGContextRestoreGState( m_cgContext);
}
else
{
- m_brush->Apply(this);
- CGContextAddPath( m_cgContext , (CGPathRef) path->GetNativePath() );
+ ((wxMacCoreGraphicsBrushData*)m_brush.GetRefData())->Apply(this);
+ CGContextAddPath( m_cgContext , (CGPathRef) path.GetNativePath() );
if ( fillStyle == wxODDEVEN_RULE )
CGContextEOFillPath( m_cgContext );
else
// we allow either setting or clearing but not replacing
wxASSERT( m_cgContext == NULL || cg == NULL );
- if ( cg )
- CGContextSaveGState( cg );
+ if ( m_cgContext )
+ {
+ // TODO : when is this necessary - should we add a Flush() method ? CGContextSynchronize( m_cgContext );
+ CGContextRestoreGState( m_cgContext );
+ CGContextRestoreGState( m_cgContext );
+ if ( m_releaseContext )
+ QDEndCGContext( GetWindowPort( m_windowRef ) , &m_cgContext);
+ else
+ CGContextRelease(m_cgContext);
+ }
+
+
m_cgContext = cg;
+
+ // FIXME: This check is needed because currently we need to use a DC/GraphicsContext
+ // in order to get font properties, like wxFont::GetPixelSize, but since we don't have
+ // a native window attached to use, I create a wxGraphicsContext with a NULL CGContextRef
+ // for this one operation.
+
+ // When wxFont::GetPixelSize on Mac no longer needs a graphics context, this check
+ // can be removed.
+ if (m_cgContext)
+ {
+ CGContextRetain(m_cgContext);
+ CGContextSaveGState( m_cgContext );
+ CGContextSaveGState( m_cgContext );
+ m_releaseContext = NULL;
+ }
}
void wxMacCoreGraphicsContext::Translate( wxDouble dx , wxDouble dy )
{
- EnsureIsValid();
-
- CGContextTranslateCTM( m_cgContext, dx, dy );
+ if ( m_cgContext )
+ CGContextTranslateCTM( m_cgContext, dx, dy );
+ else
+ m_windowTransform = CGAffineTransformTranslate(m_windowTransform,dx,dy);
}
void wxMacCoreGraphicsContext::Scale( wxDouble xScale , wxDouble yScale )
{
- EnsureIsValid();
-
- CGContextScaleCTM( m_cgContext , xScale , yScale );
+ if ( m_cgContext )
+ CGContextScaleCTM( m_cgContext , xScale , yScale );
+ else
+ m_windowTransform = CGAffineTransformScale(m_windowTransform,xScale,yScale);
}
void wxMacCoreGraphicsContext::Rotate( wxDouble angle )
{
- EnsureIsValid();
-
- CGContextRotateCTM( m_cgContext , angle );
+ if ( m_cgContext )
+ CGContextRotateCTM( m_cgContext , angle );
+ else
+ m_windowTransform = CGAffineTransformRotate(m_windowTransform,angle);
}
void wxMacCoreGraphicsContext::DrawBitmap( const wxBitmap &bmp, wxDouble x, wxDouble y, wxDouble w, wxDouble h )
CGContextRestoreGState( m_cgContext );
}
-// sets the pen
-void wxMacCoreGraphicsContext::SetPen( wxGraphicsPen* pen , bool release )
-{
- wxGraphicsContext::SetPen( pen, release );
-}
-
-// sets the brush for filling
-void wxMacCoreGraphicsContext::SetBrush( wxGraphicsBrush* brush , bool release )
-{
- wxGraphicsContext::SetBrush( brush, release );
-}
-
-// sets the font
-void wxMacCoreGraphicsContext::SetFont( wxGraphicsFont* font, bool release )
-{
- wxGraphicsContext::SetFont( font, release );
-}
-
void wxMacCoreGraphicsContext::DrawText( const wxString &str, wxDouble x, wxDouble y )
{
DrawText(str, x, y, 0.0);
void wxMacCoreGraphicsContext::DrawText( const wxString &str, wxDouble x, wxDouble y, wxDouble angle )
{
- if ( m_font == NULL )
+ if ( m_font.IsNull() )
return;
EnsureIsValid();
#endif
#endif
- ATSUStyle style = (((wxMacCoreGraphicsFont*)m_font)->GetATSUStyle());
+ ATSUStyle style = (((wxMacCoreGraphicsFontData*)m_font.GetRefData())->GetATSUStyle());
status = ::ATSUCreateTextLayoutWithTextPtr( (UniCharArrayPtr) ubuf , 0 , chars , chars , 1 ,
&chars , &style , &atsuLayout );
void wxMacCoreGraphicsContext::GetTextExtent( const wxString &str, wxDouble *width, wxDouble *height,
wxDouble *descent, wxDouble *externalLeading ) const
{
- wxCHECK_RET( m_font != NULL, wxT("wxDC(cg)::DoGetTextExtent - no valid font set") );
+ wxCHECK_RET( !m_font.IsNull(), wxT("wxDC(cg)::DoGetTextExtent - no valid font set") );
OSStatus status = noErr;
#endif
#endif
- ATSUStyle style = (((wxMacCoreGraphicsFont*)m_font)->GetATSUStyle());
+ ATSUStyle style = (((wxMacCoreGraphicsFontData*)m_font.GetRefData())->GetATSUStyle());
status = ::ATSUCreateTextLayoutWithTextPtr( (UniCharArrayPtr) ubuf , 0 , chars , chars , 1 ,
&chars , &style , &atsuLayout );
#endif
#endif
- ATSUStyle style = (((wxMacCoreGraphicsFont*)m_font)->GetATSUStyle());
+ ATSUStyle style = (((wxMacCoreGraphicsFontData*)m_font.GetRefData())->GetATSUStyle());
::ATSUCreateTextLayoutWithTextPtr( (UniCharArrayPtr) ubuf , 0 , chars , chars , 1 ,
&chars , &style , &atsuLayout );
}
// concatenates this transform with the current transform of this context
-void wxMacCoreGraphicsContext::ConcatTransform( const wxGraphicsMatrix* matrix )
+void wxMacCoreGraphicsContext::ConcatTransform( const wxGraphicsMatrix& matrix )
{
+ if ( m_cgContext )
+ CGContextConcatCTM( m_cgContext, *(CGAffineTransform*) matrix.GetNativeMatrix());
+ else
+ m_windowTransform = CGAffineTransformConcat(m_windowTransform, *(CGAffineTransform*) matrix.GetNativeMatrix());
}
// sets the transform of this context
-void wxMacCoreGraphicsContext::SetTransform( const wxGraphicsMatrix* matrix )
+void wxMacCoreGraphicsContext::SetTransform( const wxGraphicsMatrix& matrix )
{
+ if ( m_cgContext )
+ {
+ CGAffineTransform transform = CGContextGetCTM( m_cgContext );
+ transform = CGAffineTransformInvert( transform ) ;
+ CGContextConcatCTM( m_cgContext, transform);
+ CGContextConcatCTM( m_cgContext, *(CGAffineTransform*) matrix.GetNativeMatrix());
+ }
+ else
+ {
+ m_windowTransform = *(CGAffineTransform*) matrix.GetNativeMatrix();
+ }
}
// gets the matrix of this context
-void wxMacCoreGraphicsContext::GetTransform( wxGraphicsMatrix* matrix )
+wxGraphicsMatrix wxMacCoreGraphicsContext::GetTransform() const
{
+ wxGraphicsMatrix m = CreateMatrix();
+ *((CGAffineTransform*) m.GetNativeMatrix()) = ( m_cgContext == NULL ? m_windowTransform :
+ CGContextGetCTM( m_cgContext ));
+ return m;
}
//
// 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(wxMacCoreGraphicsRenderer)
// Path
-wxGraphicsPath * wxMacCoreGraphicsRenderer::CreatePath()
+wxGraphicsPath wxMacCoreGraphicsRenderer::CreatePath()
{
- return new wxMacCoreGraphicsPath( this );
+ wxGraphicsPath m;
+ m.SetRefData( new wxMacCoreGraphicsPathData(this));
+ return m;
}
// Matrix
-wxGraphicsMatrix * wxMacCoreGraphicsRenderer::CreateMatrix( wxDouble a, wxDouble b, wxDouble c, wxDouble d,
+wxGraphicsMatrix wxMacCoreGraphicsRenderer::CreateMatrix( wxDouble a, wxDouble b, wxDouble c, wxDouble d,
wxDouble tx, wxDouble ty)
-
{
- wxMacCoreGraphicsMatrix* m = new wxMacCoreGraphicsMatrix( this );
- m->Set( a,b,c,d,tx,ty ) ;
+ wxGraphicsMatrix m;
+ wxMacCoreGraphicsMatrixData* data = new wxMacCoreGraphicsMatrixData( this );
+ data->Set( a,b,c,d,tx,ty ) ;
+ m.SetRefData(data);
return m;
}
-wxGraphicsPen* wxMacCoreGraphicsRenderer::CreatePen(const wxPen& pen)
+wxGraphicsPen wxMacCoreGraphicsRenderer::CreatePen(const wxPen& pen)
{
if ( !pen.Ok() || pen.GetStyle() == wxTRANSPARENT )
- return NULL;
+ return wxNullGraphicsPen;
else
- return new wxMacCoreGraphicsPen( this, pen );
+ {
+ wxGraphicsPen p;
+ p.SetRefData(new wxMacCoreGraphicsPenData( this, pen ));
+ return p;
+ }
}
-wxGraphicsBrush* wxMacCoreGraphicsRenderer::CreateBrush(const wxBrush& brush )
+wxGraphicsBrush wxMacCoreGraphicsRenderer::CreateBrush(const wxBrush& brush )
{
if ( !brush.Ok() || brush.GetStyle() == wxTRANSPARENT )
- return NULL;
+ return wxNullGraphicsBrush;
else
- return new wxMacCoreGraphicsBrush( this, brush );
+ {
+ wxGraphicsBrush p;
+ p.SetRefData(new wxMacCoreGraphicsBrushData( 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* wxMacCoreGraphicsRenderer::CreateLinearGradientBrush( wxDouble x1, wxDouble y1, wxDouble x2, wxDouble y2,
+wxGraphicsBrush wxMacCoreGraphicsRenderer::CreateLinearGradientBrush( wxDouble x1, wxDouble y1, wxDouble x2, wxDouble y2,
const wxColour&c1, const wxColour&c2)
{
- wxMacCoreGraphicsBrush* brush = new wxMacCoreGraphicsBrush(this);
- brush->CreateLinearGradientBrush(x1, y1, x2, y2, c1, c2);
- return brush;
+ wxGraphicsBrush p;
+ wxMacCoreGraphicsBrushData* d = new wxMacCoreGraphicsBrushData( 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* wxMacCoreGraphicsRenderer::CreateRadialGradientBrush( wxDouble xo, wxDouble yo, wxDouble xc, wxDouble yc, wxDouble radius,
+wxGraphicsBrush wxMacCoreGraphicsRenderer::CreateRadialGradientBrush( wxDouble xo, wxDouble yo, wxDouble xc, wxDouble yc, wxDouble radius,
const wxColour &oColor, const wxColour &cColor)
{
- wxMacCoreGraphicsBrush* brush = new wxMacCoreGraphicsBrush(this);
- brush->CreateRadialGradientBrush(xo,yo,xc,yc,radius,oColor,cColor);
- return brush;
+ wxGraphicsBrush p;
+ wxMacCoreGraphicsBrushData* d = new wxMacCoreGraphicsBrushData( this );
+ d->CreateRadialGradientBrush(xo,yo,xc,yc,radius,oColor,cColor);
+ p.SetRefData(d);
+ return p;
}
// sets the font
-wxGraphicsFont* wxMacCoreGraphicsRenderer::CreateFont( const wxFont &font , const wxColour &col )
+wxGraphicsFont wxMacCoreGraphicsRenderer::CreateFont( const wxFont &font , const wxColour &col )
{
if ( font.Ok() )
- return new wxMacCoreGraphicsFont( this , font, col );
+ {
+ wxGraphicsFont p;
+ p.SetRefData(new wxMacCoreGraphicsFontData( this , font, col ));
+ return p;
+ }
else
- return NULL;
+ return wxNullGraphicsFont;
}
projects / wxWidgets.git / blobdiff