Correction to style code

[wxWidgets.git] / src / msw / graphics.cpp

diff --git a/src/msw/graphics.cpp b/src/msw/graphics.cpp
index 520da0e709c5ac0c31d0888e854f5c661edb90ce..d7b1c86969ef8cfad41dea829ea65b99cc7ba77a 100644 (file)
--- a/src/msw/graphics.cpp
+++ b/src/msw/graphics.cpp
@@ -92,14 +92,13 @@ static inline double RadToDeg(double deg) { return (deg * 180.0) / M_PI; }
 #include "gdiplus.h"
 using namespace Gdiplus;
 
 #include "gdiplus.h"
 using namespace Gdiplus;
 

-class WXDLLIMPEXP_CORE wxGDIPlusPath : public wxGraphicsPath
+class WXDLLIMPEXP_CORE wxGDIPlusPathData : public wxGraphicsPathData

 {
 public :
 {
 public :

-    wxGDIPlusPath();
-    wxGDIPlusPath(wxGraphicsRenderer* renderer, GraphicsPath* path = NULL);
-    ~wxGDIPlusPath();
+    wxGDIPlusPathData(wxGraphicsRenderer* renderer, GraphicsPath* path = NULL);
+    ~wxGDIPlusPathData();

 
 

-    virtual wxGraphicsPath *Clone() const;
+    virtual wxGraphicsObjectRefData *Clone() const;

 
     //
     // These are the path primitives from which everything else can be constructed
 
     //
     // These are the path primitives from which everything else can be constructed


@@ -108,31 +107,31 @@ public :
     // begins a new subpath at (x,y)
     virtual void MoveToPoint( wxDouble x, wxDouble y );
 
     // begins a new subpath at (x,y)
     virtual void MoveToPoint( wxDouble x, wxDouble y );
 

-    // adds a straight line from the current point to (x,y) 
+    // adds a straight line from the current point to (x,y)

     virtual void AddLineToPoint( wxDouble x, wxDouble y );
 
     // adds a cubic Bezier curve from the current point, using two control points and an end point
     virtual void AddCurveToPoint( wxDouble cx1, wxDouble cy1, wxDouble cx2, wxDouble cy2, wxDouble x, wxDouble y );
 
 
     virtual void AddLineToPoint( wxDouble x, wxDouble y );
 
     // adds a cubic Bezier curve from the current point, using two control points and an end point
     virtual void AddCurveToPoint( wxDouble cx1, wxDouble cy1, wxDouble cx2, wxDouble cy2, wxDouble x, wxDouble y );
 
 

-    // adds an arc of a circle centering at (x,y) with radius (r) from startAngle to endAngle 
+    // 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 ) ;
 
     // gets the last point of the current path, (0,0) if not yet set
     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
 
     // adds another path

-    virtual void AddPath( const wxGraphicsPath* path );
+    virtual void AddPath( const wxGraphicsPathData* path );

 
     // closes the current sub-path
     virtual void CloseSubpath();
 
     //
 
     // closes the current sub-path
     virtual void CloseSubpath();
 
     //

-    // These are convenience functions which - if not available natively will be assembled 
+    // These are convenience functions which - if not available natively will be assembled

     // using the primitives from above
     //
 
     // using the primitives from above
     //
 

-    // appends a rectangle as a new closed subpath 
+    // appends a rectangle as a new closed subpath

     virtual void AddRectangle( wxDouble x, wxDouble y, wxDouble w, wxDouble h ) ;
     /*
 
     virtual void AddRectangle( wxDouble x, wxDouble y, wxDouble w, wxDouble h ) ;
     /*
 


@@ -143,53 +142,47 @@ public :
     virtual void AddArcToPoint( wxDouble x1, wxDouble y1 , wxDouble x2, wxDouble y2, wxDouble r )  ;
 */
 
     virtual void AddArcToPoint( wxDouble x1, wxDouble y1 , wxDouble x2, wxDouble y2, wxDouble r )  ;
 */
 

-       // 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 * WXUNUSED(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 * WXUNUSED(path)) const {}

 
     // transforms each point of this path by the matrix
 
     // 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)
 
     // 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 = wxODDEVEN_RULE) const;

 
 private :
     GraphicsPath* m_path;
 
 private :
     GraphicsPath* m_path;

-    DECLARE_DYNAMIC_CLASS_NO_COPY(wxGDIPlusPath)

 };
 
 };
 

-class WXDLLIMPEXP_CORE wxGDIPlusMatrix : public wxGraphicsMatrix
+class WXDLLIMPEXP_CORE wxGDIPlusMatrixData : public wxGraphicsMatrixData

 {
 public :
 {
 public :

-    wxGDIPlusMatrix() ;
-
-    wxGDIPlusMatrix(wxGraphicsRenderer* renderer, Matrix* matrix = NULL ) ;
-    virtual ~wxGDIPlusMatrix() ;
+    wxGDIPlusMatrixData(wxGraphicsRenderer* renderer, Matrix* matrix = NULL) ;
+    virtual ~wxGDIPlusMatrixData() ;

 
 

-    virtual wxGraphicsMatrix *Clone() const ;
+    virtual wxGraphicsObjectRefData* Clone() const ;

 
     // concatenates the matrix
 
     // 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
 
     // sets the matrix to the respective values

-    virtual void Set(wxDouble a=1.0, wxDouble b=0.0, wxDouble c=0.0, wxDouble d=1.0, 
+    virtual void Set(wxDouble a=1.0, wxDouble b=0.0, wxDouble c=0.0, wxDouble d=1.0,

         wxDouble tx=0.0, wxDouble ty=0.0);
 
     // makes this the inverse matrix
     virtual void Invert();
 
     // returns true if the elements of the transformation matrix are equal ?
         wxDouble tx=0.0, wxDouble ty=0.0);
 
     // 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
 
     // return true if this is the identity matrix

-    virtual bool IsIdentity();
+    virtual bool IsIdentity() const;

 
     //
     // transformation
 
     //
     // transformation


@@ -202,24 +195,22 @@ public :
     virtual void Scale( wxDouble xScale , wxDouble yScale );
 
     // add the rotation to this matrix (radians)
     virtual void Scale( wxDouble xScale , wxDouble yScale );
 
     // add the rotation to this matrix (radians)

-    virtual void Rotate( wxDouble angle );     
+    virtual void Rotate( wxDouble angle );

 
     //
     // apply the transforms
     //
 
     // applies that matrix to the point
 
     //
     // apply the transforms
     //
 
     // 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
 
     // 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:
     Matrix* m_matrix ;
 
     // returns the native representation
     virtual void * GetNativeMatrix() const;
 private:
     Matrix* m_matrix ;

-
-    DECLARE_DYNAMIC_CLASS_NO_COPY(wxGDIPlusMatrix)

 } ;
 
 class WXDLLIMPEXP_CORE wxGDIPlusPenData : public wxGraphicsObjectRefData
 } ;
 
 class WXDLLIMPEXP_CORE wxGDIPlusPenData : public wxGraphicsObjectRefData


@@ -248,7 +239,7 @@ public:
     wxGDIPlusBrushData( wxGraphicsRenderer* renderer, const wxBrush &brush );
     ~wxGDIPlusBrushData ();
 
     wxGDIPlusBrushData( wxGraphicsRenderer* renderer, const wxBrush &brush );
     ~wxGDIPlusBrushData ();
 

-    void CreateLinearGradientBrush( wxDouble x1, wxDouble y1, wxDouble x2, wxDouble y2, 
+    void CreateLinearGradientBrush( wxDouble x1, wxDouble y1, wxDouble x2, wxDouble y2,

         const wxColour&c1, const wxColour&c2 );
     void CreateRadialGradientBrush( wxDouble xo, wxDouble yo, wxDouble xc, wxDouble yc, wxDouble radius,
         const wxColour &oColor, const wxColour &cColor );
         const wxColour&c1, const wxColour&c2 );
     void CreateRadialGradientBrush( wxDouble xo, wxDouble yo, wxDouble xc, wxDouble yc, wxDouble radius,
         const wxColour &oColor, const wxColour &cColor );


@@ -289,31 +280,31 @@ public:
     virtual void Clip( const wxRegion &region );
     // clips drawings to the rect
     virtual void Clip( wxDouble x, wxDouble y, wxDouble w, wxDouble h );
     virtual void Clip( const wxRegion &region );
     // clips drawings to the rect
     virtual void Clip( wxDouble x, wxDouble y, wxDouble w, wxDouble h );

-       
-       // resets the clipping to original extent
-       virtual void ResetClip();

 
 

-       virtual void * GetNativeContext();
-       
-    virtual void StrokePath( const wxGraphicsPath *p );
-    virtual void FillPath( const wxGraphicsPath *p , int fillStyle = wxWINDING_RULE );
+    // resets the clipping to original extent
+    virtual void ResetClip();
+
+    virtual void * GetNativeContext();

 
 

-    virtual void Translate( wxDouble dx , wxDouble dy );    
-    virtual void Scale( wxDouble xScale , wxDouble yScale );    
-    virtual void Rotate( wxDouble angle );    
+    virtual void StrokePath( const wxGraphicsPath& p );
+    virtual void FillPath( const wxGraphicsPath& p , int fillStyle = wxODDEVEN_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
 
     // 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
 
     // sets the transform of this context

-    virtual void SetTransform( const wxGraphicsMatrix* matrix );
+    virtual void SetTransform( const wxGraphicsMatrix& matrix );

 
     // gets the matrix of this context
 
     // 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 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 PushState();    
+    virtual void PushState();

     virtual void PopState();
 
     virtual void DrawText( const wxString &str, wxDouble x, wxDouble y);
     virtual void PopState();
 
     virtual void DrawText( const wxString &str, wxDouble x, wxDouble y);


@@ -353,7 +344,7 @@ void wxGDIPlusPenData::Init()
 
 wxGDIPlusPenData::wxGDIPlusPenData( wxGraphicsRenderer* renderer, const wxPen &pen )
 : wxGraphicsObjectRefData(renderer)
 
 wxGDIPlusPenData::wxGDIPlusPenData( wxGraphicsRenderer* renderer, const wxPen &pen )
 : wxGraphicsObjectRefData(renderer)

-{    
+{

     Init();
     m_width = pen.GetWidth();
     if (m_width <= 0.0)
     Init();
     m_width = pen.GetWidth();
     if (m_width <= 0.0)


@@ -488,7 +479,7 @@ wxGDIPlusPenData::wxGDIPlusPenData( wxGraphicsRenderer* renderer, const wxPen &p
             m_pen->SetBrush( m_penBrush );
         }
         break;
             m_pen->SetBrush( m_penBrush );
         }
         break;

-    } 
+    }

     if ( dashStyle != DashStyleSolid )
         m_pen->SetDashStyle(dashStyle);
 }
     if ( dashStyle != DashStyleSolid )
         m_pen->SetDashStyle(dashStyle);
 }


@@ -540,7 +531,7 @@ wxGDIPlusBrushData::wxGDIPlusBrushData( wxGraphicsRenderer* renderer , const wxB
         m_brush = new HatchBrush(style,Color( brush.GetColour().Alpha() , brush.GetColour().Red() ,
             brush.GetColour().Green() , brush.GetColour().Blue() ), Color::Transparent );
     }
         m_brush = new HatchBrush(style,Color( brush.GetColour().Alpha() , brush.GetColour().Red() ,
             brush.GetColour().Green() , brush.GetColour().Blue() ), Color::Transparent );
     }

-    else 
+    else

     {
         wxBitmap* bmp = brush.GetStipple();
         if ( bmp && bmp->Ok() )
     {
         wxBitmap* bmp = brush.GetStipple();
         if ( bmp && bmp->Ok() )


@@ -566,7 +557,7 @@ void wxGDIPlusBrushData::Init()
     m_brushPath= NULL;
 }
 
     m_brushPath= NULL;
 }
 

-void wxGDIPlusBrushData::CreateLinearGradientBrush( wxDouble x1, wxDouble y1, wxDouble x2, wxDouble y2, const wxColour&c1, const wxColour&c2) 
+void wxGDIPlusBrushData::CreateLinearGradientBrush( wxDouble x1, wxDouble y1, wxDouble x2, wxDouble y2, const wxColour&c1, const wxColour&c2)

 {
     m_brush = new LinearGradientBrush( PointF( x1,y1) , PointF( x2,y2),
         Color( c1.Alpha(), c1.Red(),c1.Green() , c1.Blue() ),
 {
     m_brush = new LinearGradientBrush( PointF( x1,y1) , PointF( x2,y2),
         Color( c1.Alpha(), c1.Red(),c1.Green() , c1.Blue() ),


@@ -594,7 +585,7 @@ void wxGDIPlusBrushData::CreateRadialGradientBrush( wxDouble xo, wxDouble yo, wx
 // wxGDIPlusFont implementation
 //-----------------------------------------------------------------------------
 
 // wxGDIPlusFont implementation
 //-----------------------------------------------------------------------------
 

-wxGDIPlusFontData::wxGDIPlusFontData( wxGraphicsRenderer* renderer, const wxFont &font, 
+wxGDIPlusFontData::wxGDIPlusFontData( wxGraphicsRenderer* renderer, const wxFont &font,

                              const wxColour& col ) : wxGraphicsObjectRefData( renderer )
 {
     m_textBrush = NULL;
                              const wxColour& col ) : wxGraphicsObjectRefData( renderer )
 {
     m_textBrush = NULL;


@@ -624,9 +615,7 @@ wxGDIPlusFontData::~wxGDIPlusFontData()
 // wxGDIPlusPath implementation
 //-----------------------------------------------------------------------------
 
 // wxGDIPlusPath implementation
 //-----------------------------------------------------------------------------
 

-IMPLEMENT_DYNAMIC_CLASS(wxGDIPlusPath,wxGraphicsPath)
-
-wxGDIPlusPath::wxGDIPlusPath(wxGraphicsRenderer* renderer, GraphicsPath* path ) : wxGraphicsPath(renderer)
+wxGDIPlusPathData::wxGDIPlusPathData(wxGraphicsRenderer* renderer, GraphicsPath* path ) : wxGraphicsPathData(renderer)

 {
     if ( path )
         m_path = path;
 {
     if ( path )
         m_path = path;


@@ -634,45 +623,37 @@ wxGDIPlusPath::wxGDIPlusPath(wxGraphicsRenderer* renderer, GraphicsPath* path )
         m_path = new GraphicsPath();
 }
 
         m_path = new GraphicsPath();
 }
 

-wxGDIPlusPath::wxGDIPlusPath() : wxGraphicsPath(NULL)
-{
-    wxLogDebug(wxT("Illegal Constructor called"));
-}
-
-
-wxGDIPlusPath::~wxGDIPlusPath()
+wxGDIPlusPathData::~wxGDIPlusPathData()

 {
     delete m_path;
 }
 
 {
     delete m_path;
 }
 

-wxGraphicsPath* wxGDIPlusPath::Clone() const
+wxGraphicsObjectRefData* wxGDIPlusPathData::Clone() const

 {
 {

-    return new wxGDIPlusPath( GetRenderer() , m_path->Clone());
+    return new wxGDIPlusPathData( GetRenderer() , m_path->Clone());

 }
 
 }
 

-
-

 //
 // The Primitives
 //
 
 //
 // The Primitives
 //
 

-void wxGDIPlusPath::MoveToPoint( wxDouble x , wxDouble y )
+void wxGDIPlusPathData::MoveToPoint( wxDouble x , wxDouble y )

 {
     m_path->StartFigure();
     m_path->AddLine((REAL) x,(REAL) y,(REAL) x,(REAL) y);
 }
 
 {
     m_path->StartFigure();
     m_path->AddLine((REAL) x,(REAL) y,(REAL) x,(REAL) y);
 }
 

-void wxGDIPlusPath::AddLineToPoint( wxDouble x , wxDouble y )
+void wxGDIPlusPathData::AddLineToPoint( wxDouble x , wxDouble y )

 {
     m_path->AddLine((REAL) x,(REAL) y,(REAL) x,(REAL) y);
 }
 
 {
     m_path->AddLine((REAL) x,(REAL) y,(REAL) x,(REAL) y);
 }
 

-void wxGDIPlusPath::CloseSubpath()
+void wxGDIPlusPathData::CloseSubpath()

 {
     m_path->CloseFigure();
 }
 
 {
     m_path->CloseFigure();
 }
 

-void wxGDIPlusPath::AddCurveToPoint( wxDouble cx1, wxDouble cy1, wxDouble cx2, wxDouble cy2, wxDouble x, wxDouble y )
+void wxGDIPlusPathData::AddCurveToPoint( wxDouble cx1, wxDouble cy1, wxDouble cx2, wxDouble cy2, wxDouble x, wxDouble y )

 {
     PointF c1(cx1,cy1);
     PointF c2(cx2,cy2);
 {
     PointF c1(cx1,cy1);
     PointF c2(cx2,cy2);


@@ -683,15 +664,15 @@ void wxGDIPlusPath::AddCurveToPoint( wxDouble cx1, wxDouble cy1, wxDouble cx2, w
 }
 
 // gets the last point of the current path, (0,0) if not yet set
 }
 
 // gets the last point of the current path, (0,0) if not yet set

-void wxGDIPlusPath::GetCurrentPoint( wxDouble& x, wxDouble&y) 
+void wxGDIPlusPathData::GetCurrentPoint( wxDouble* x, wxDouble* y) const

 {
     PointF start;
     m_path->GetLastPoint(&start);
 {
     PointF start;
     m_path->GetLastPoint(&start);

-    x = start.X ;
-    y = start.Y ;
+    *x = start.X ;
+    *y = start.Y ;

 }
 
 }
 

-void wxGDIPlusPath::AddArc( wxDouble x, wxDouble y, wxDouble r, double startAngle, double endAngle, bool clockwise ) 
+void wxGDIPlusPathData::AddArc( wxDouble x, wxDouble y, wxDouble r, double startAngle, double endAngle, bool clockwise )

 {
     double sweepAngle = endAngle - startAngle ;
     if( abs(sweepAngle) >= 2*M_PI)
 {
     double sweepAngle = endAngle - startAngle ;
     if( abs(sweepAngle) >= 2*M_PI)


@@ -712,28 +693,28 @@ void wxGDIPlusPath::AddArc( wxDouble x, wxDouble y, wxDouble r, double startAngl
 
         }
    }
 
         }
    }

-   m_path->AddArc((REAL) (x-r),(REAL) (y-r),(REAL) (2*r),(REAL) (2*r),RadToDeg(startAngle),RadToDeg(sweepAngle)); 
+   m_path->AddArc((REAL) (x-r),(REAL) (y-r),(REAL) (2*r),(REAL) (2*r),RadToDeg(startAngle),RadToDeg(sweepAngle));

 }
 
 }
 

-void wxGDIPlusPath::AddRectangle( wxDouble x, wxDouble y, wxDouble w, wxDouble h )
+void wxGDIPlusPathData::AddRectangle( wxDouble x, wxDouble y, wxDouble w, wxDouble h )

 {
     m_path->AddRectangle(RectF(x,y,w,h));
 }
 
 {
     m_path->AddRectangle(RectF(x,y,w,h));
 }
 

-void wxGDIPlusPath::AddPath( const wxGraphicsPath* path )
+void wxGDIPlusPathData::AddPath( const wxGraphicsPathData* path )

 {
     m_path->AddPath( (GraphicsPath*) path->GetNativePath(), FALSE);
 }
 
 
 // transforms each point of this path by the matrix
 {
     m_path->AddPath( (GraphicsPath*) path->GetNativePath(), FALSE);
 }
 
 
 // transforms each point of this path by the matrix

-void wxGDIPlusPath::Transform( wxGraphicsMatrix* matrix ) 
+void wxGDIPlusPathData::Transform( const wxGraphicsMatrixData* matrix )

 {
     m_path->Transform( (Matrix*) matrix->GetNativeMatrix() );
 }
 
 // gets the bounding box enclosing all points (possibly including control points)
 {
     m_path->Transform( (Matrix*) matrix->GetNativeMatrix() );
 }
 
 // gets the bounding box enclosing all points (possibly including control points)

-void wxGDIPlusPath::GetBox(wxDouble *x, wxDouble *y, wxDouble *w, wxDouble *h) 
+void wxGDIPlusPathData::GetBox(wxDouble *x, wxDouble *y, wxDouble *w, wxDouble *h) const

 {
     RectF bounds;
     m_path->GetBounds( &bounds, NULL, NULL) ;
 {
     RectF bounds;
     m_path->GetBounds( &bounds, NULL, NULL) ;


@@ -743,25 +724,18 @@ void wxGDIPlusPath::GetBox(wxDouble *x, wxDouble *y, wxDouble *w, wxDouble *h)
     *h = bounds.Height;
 }
 
     *h = bounds.Height;
 }
 

-bool wxGDIPlusPath::Contains( wxDouble x, wxDouble y, int fillStyle ) 
+bool wxGDIPlusPathData::Contains( wxDouble x, wxDouble y, int fillStyle ) const

 {
     m_path->SetFillMode( fillStyle == wxODDEVEN_RULE ? FillModeAlternate : FillModeWinding);
     return m_path->IsVisible( (FLOAT) x,(FLOAT) y) == TRUE ;
 }
 
 //-----------------------------------------------------------------------------
 {
     m_path->SetFillMode( fillStyle == wxODDEVEN_RULE ? FillModeAlternate : FillModeWinding);
     return m_path->IsVisible( (FLOAT) x,(FLOAT) y) == TRUE ;
 }
 
 //-----------------------------------------------------------------------------

-// wxGDIPlusMatrix implementation
+// wxGDIPlusMatrixData implementation

 //-----------------------------------------------------------------------------
 
 //-----------------------------------------------------------------------------
 

-IMPLEMENT_DYNAMIC_CLASS(wxGDIPlusMatrix,wxGraphicsMatrix)
-
-wxGDIPlusMatrix::wxGDIPlusMatrix() : wxGraphicsMatrix(NULL)
-{
-    wxLogDebug(wxT("Illegal Constructor called"));
-}
-
-wxGDIPlusMatrix::wxGDIPlusMatrix(wxGraphicsRenderer* renderer, Matrix* matrix )
-    : wxGraphicsMatrix(renderer)
+wxGDIPlusMatrixData::wxGDIPlusMatrixData(wxGraphicsRenderer* renderer, Matrix* matrix )
+    : wxGraphicsMatrixData(renderer)

 {
     if ( matrix )
         m_matrix = matrix ;
 {
     if ( matrix )
         m_matrix = matrix ;


@@ -769,50 +743,43 @@ wxGDIPlusMatrix::wxGDIPlusMatrix(wxGraphicsRenderer* renderer, Matrix* matrix )
         m_matrix = new Matrix();
 }
 
         m_matrix = new Matrix();
 }
 

-wxGDIPlusMatrix::~wxGDIPlusMatrix() 
+wxGDIPlusMatrixData::~wxGDIPlusMatrixData()

 {
     delete m_matrix;
 }
 
 {
     delete m_matrix;
 }
 

-wxGraphicsMatrix *wxGDIPlusMatrix::Clone() const 
+wxGraphicsObjectRefData *wxGDIPlusMatrixData::Clone() const

 {
 {

-    return new wxGDIPlusMatrix( GetRenderer(), m_matrix->Clone());
+    return new wxGDIPlusMatrixData( GetRenderer(), m_matrix->Clone());

 }
 
 // concatenates the matrix
 }
 
 // concatenates the matrix

-void wxGDIPlusMatrix::Concat( const wxGraphicsMatrix *t )
+void wxGDIPlusMatrixData::Concat( const wxGraphicsMatrixData *t )

 {
     m_matrix->Multiply( (Matrix*) t->GetNativeMatrix());
 }
 
 {
     m_matrix->Multiply( (Matrix*) t->GetNativeMatrix());
 }
 

-// copies the passed in matrix
-void wxGDIPlusMatrix::Copy( const wxGraphicsMatrix *t )
-{
-    delete m_matrix;
-    m_matrix = ((Matrix*) t->GetNativeMatrix())->Clone();
-}
-

 // sets the matrix to the respective values
 // sets the matrix to the respective values

-void wxGDIPlusMatrix::Set(wxDouble a, wxDouble b, wxDouble c, wxDouble d, 
+void wxGDIPlusMatrixData::Set(wxDouble a, wxDouble b, wxDouble c, wxDouble d,

                  wxDouble tx, wxDouble ty)
 {
     m_matrix->SetElements(a,b,c,d,tx,ty);
 }
 
 // makes this the inverse matrix
                  wxDouble tx, wxDouble ty)
 {
     m_matrix->SetElements(a,b,c,d,tx,ty);
 }
 
 // makes this the inverse matrix

-void wxGDIPlusMatrix::Invert()
+void wxGDIPlusMatrixData::Invert()

 {
     m_matrix->Invert();
 }
 
 // returns true if the elements of the transformation matrix are equal ?
 {
     m_matrix->Invert();
 }
 
 // returns true if the elements of the transformation matrix are equal ?

-bool wxGDIPlusMatrix::IsEqual( const wxGraphicsMatrix* t) const 
+bool wxGDIPlusMatrixData::IsEqual( const wxGraphicsMatrixData* t) const

 {
     return m_matrix->Equals((Matrix*) t->GetNativeMatrix())== TRUE ;
 }
 
 // return true if this is the identity matrix
 {
     return m_matrix->Equals((Matrix*) t->GetNativeMatrix())== TRUE ;
 }
 
 // return true if this is the identity matrix

-bool wxGDIPlusMatrix::IsIdentity()
+bool wxGDIPlusMatrixData::IsIdentity() const

 {
     return m_matrix->IsIdentity() == TRUE ;
 }
 {
     return m_matrix->IsIdentity() == TRUE ;
 }


@@ -822,19 +789,19 @@ bool wxGDIPlusMatrix::IsIdentity()
 //
 
 // add the translation to this matrix
 //
 
 // add the translation to this matrix

-void wxGDIPlusMatrix::Translate( wxDouble dx , wxDouble dy )
+void wxGDIPlusMatrixData::Translate( wxDouble dx , wxDouble dy )

 {
     m_matrix->Translate(dx,dy);
 }
 
 // add the scale to this matrix
 {
     m_matrix->Translate(dx,dy);
 }
 
 // add the scale to this matrix

-void wxGDIPlusMatrix::Scale( wxDouble xScale , wxDouble yScale )
+void wxGDIPlusMatrixData::Scale( wxDouble xScale , wxDouble yScale )

 {
     m_matrix->Scale(xScale,yScale);
 }
 
 // add the rotation to this matrix (radians)
 {
     m_matrix->Scale(xScale,yScale);
 }
 
 // add the rotation to this matrix (radians)

-void wxGDIPlusMatrix::Rotate( wxDouble angle )
+void wxGDIPlusMatrixData::Rotate( wxDouble angle )

 {
     m_matrix->Rotate( angle );
 }
 {
     m_matrix->Rotate( angle );
 }


@@ -844,7 +811,7 @@ void wxGDIPlusMatrix::Rotate( wxDouble angle )
 //
 
 // applies that matrix to the point
 //
 
 // applies that matrix to the point

-void wxGDIPlusMatrix::TransformPoint( wxDouble *x, wxDouble *y )
+void wxGDIPlusMatrixData::TransformPoint( wxDouble *x, wxDouble *y ) const

 {
     PointF pt(*x,*y);
     m_matrix->TransformPoints(&pt);
 {
     PointF pt(*x,*y);
     m_matrix->TransformPoints(&pt);


@@ -853,7 +820,7 @@ void wxGDIPlusMatrix::TransformPoint( wxDouble *x, wxDouble *y )
 }
 
 // applies the matrix except for translations
 }
 
 // applies the matrix except for translations

-void wxGDIPlusMatrix::TransformDistance( wxDouble *dx, wxDouble *dy )
+void wxGDIPlusMatrixData::TransformDistance( wxDouble *dx, wxDouble *dy ) const

 {
     PointF pt(*dx,*dy);
     m_matrix->TransformVectors(&pt);
 {
     PointF pt(*dx,*dy);
     m_matrix->TransformVectors(&pt);


@@ -862,7 +829,7 @@ void wxGDIPlusMatrix::TransformDistance( wxDouble *dx, wxDouble *dy )
 }
 
 // returns the native representation
 }
 
 // returns the native representation

-void * wxGDIPlusMatrix::GetNativeMatrix() const
+void * wxGDIPlusMatrixData::GetNativeMatrix() const

 {
     return m_matrix;
 }
 {
     return m_matrix;
 }


@@ -873,7 +840,7 @@ void * wxGDIPlusMatrix::GetNativeMatrix() const
 
 IMPLEMENT_DYNAMIC_CLASS(wxGDIPlusContext,wxGraphicsContext)
 
 
 IMPLEMENT_DYNAMIC_CLASS(wxGDIPlusContext,wxGraphicsContext)
 

-wxGDIPlusContext::wxGDIPlusContext( wxGraphicsRenderer* renderer, HDC hdc  ) 
+wxGDIPlusContext::wxGDIPlusContext( wxGraphicsRenderer* renderer, HDC hdc  )

     : wxGraphicsContext(renderer)
 {
     Init();
     : wxGraphicsContext(renderer)
 {
     Init();


@@ -929,43 +896,44 @@ wxGDIPlusContext::~wxGDIPlusContext()
 
 void wxGDIPlusContext::Clip( const wxRegion &region )
 {
 
 void wxGDIPlusContext::Clip( const wxRegion &region )
 {

-    m_context->SetClip((HRGN)region.GetHRGN(),CombineModeIntersect);
+    Region rgn((HRGN)region.GetHRGN());
+    m_context->SetClip(&rgn,CombineModeIntersect);

 }
 
 void wxGDIPlusContext::Clip( wxDouble x, wxDouble y, wxDouble w, wxDouble h )
 {
     m_context->SetClip(RectF(x,y,w,h),CombineModeIntersect);
 }
 }
 
 void wxGDIPlusContext::Clip( wxDouble x, wxDouble y, wxDouble w, wxDouble h )
 {
     m_context->SetClip(RectF(x,y,w,h),CombineModeIntersect);
 }

-       
+

 void wxGDIPlusContext::ResetClip()
 {
     m_context->ResetClip();
 }
 
 void wxGDIPlusContext::ResetClip()
 {
     m_context->ResetClip();
 }
 

-void wxGDIPlusContext::StrokePath( const wxGraphicsPath *path )
+void wxGDIPlusContext::StrokePath( const wxGraphicsPath& path )

 {
     if ( !m_pen.IsNull() )
     {
 {
     if ( !m_pen.IsNull() )
     {

-        m_context->DrawPath( ((wxGDIPlusPenData*)m_pen.GetGraphicsData())->GetGDIPlusPen() , (GraphicsPath*) path->GetNativePath() );
+        m_context->DrawPath( ((wxGDIPlusPenData*)m_pen.GetGraphicsData())->GetGDIPlusPen() , (GraphicsPath*) path.GetNativePath() );

     }
 }
 
     }
 }
 

-void wxGDIPlusContext::FillPath( const wxGraphicsPath *path , int fillStyle )
+void wxGDIPlusContext::FillPath( const wxGraphicsPath& path , int fillStyle )

 {
     if ( !m_brush.IsNull() )
     {
 {
     if ( !m_brush.IsNull() )
     {

-        ((GraphicsPath*) path->GetNativePath())->SetFillMode( fillStyle == wxODDEVEN_RULE ? FillModeAlternate : FillModeWinding);
-        m_context->FillPath( ((wxGDIPlusBrushData*)m_brush.GetRefData())->GetGDIPlusBrush() , 
-            (GraphicsPath*) path->GetNativePath());
+        ((GraphicsPath*) path.GetNativePath())->SetFillMode( fillStyle == wxODDEVEN_RULE ? FillModeAlternate : FillModeWinding);
+        m_context->FillPath( ((wxGDIPlusBrushData*)m_brush.GetRefData())->GetGDIPlusBrush() ,
+            (GraphicsPath*) path.GetNativePath());

     }
 }
 
     }
 }
 

-void wxGDIPlusContext::Rotate( wxDouble angle ) 
+void wxGDIPlusContext::Rotate( wxDouble angle )

 {
     m_context->RotateTransform( RadToDeg(angle) );
 }
 
 {
     m_context->RotateTransform( RadToDeg(angle) );
 }
 

-void wxGDIPlusContext::Translate( wxDouble dx , wxDouble dy ) 
+void wxGDIPlusContext::Translate( wxDouble dx , wxDouble dy )

 {
     m_context->TranslateTransform( dx , dy );
 }
 {
     m_context->TranslateTransform( dx , dy );
 }


@@ -981,23 +949,23 @@ void wxGDIPlusContext::PushState()
     m_stateStack.push_back(state);
 }
 
     m_stateStack.push_back(state);
 }
 

-void wxGDIPlusContext::PopState() 
+void wxGDIPlusContext::PopState()

 {
     GraphicsState state = m_stateStack.back();
     m_stateStack.pop_back();
     m_context->Restore(state);
 }
 
 {
     GraphicsState state = m_stateStack.back();
     m_stateStack.pop_back();
     m_context->Restore(state);
 }
 

-// the built-in conversions functions create non-premultiplied bitmaps, while GDIPlus needs them in the 
-// premultiplied format, therefore in the failing cases we create a new bitmap using the non-premultiplied 
+// the built-in conversions functions create non-premultiplied bitmaps, while GDIPlus needs them in the
+// premultiplied format, therefore in the failing cases we create a new bitmap using the non-premultiplied

 // bytes as parameter
 
 // bytes as parameter
 

-void wxGDIPlusContext::DrawBitmap( const wxBitmap &bmp, wxDouble x, wxDouble y, wxDouble w, wxDouble h ) 
+void wxGDIPlusContext::DrawBitmap( const wxBitmap &bmp, wxDouble x, wxDouble y, wxDouble w, wxDouble h )

 {
     Bitmap* image = NULL;
     Bitmap* helper = NULL;
     if ( bmp.GetMask() )
 {
     Bitmap* image = NULL;
     Bitmap* helper = NULL;
     if ( bmp.GetMask() )

-    { 
+    {

         Bitmap interim((HBITMAP)bmp.GetHBITMAP(),(HPALETTE)bmp.GetPalette()->GetHPALETTE()) ;
 
         size_t width = interim.GetWidth();
         Bitmap interim((HBITMAP)bmp.GetHBITMAP(),(HPALETTE)bmp.GetPalette()->GetHPALETTE()) ;
 
         size_t width = interim.GetWidth();


@@ -1010,7 +978,7 @@ void wxGDIPlusContext::DrawBitmap( const wxBitmap &bmp, wxDouble x, wxDouble y,
         wxASSERT(interimMask.GetPixelFormat() == PixelFormat1bppIndexed);
 
         BitmapData dataMask ;
         wxASSERT(interimMask.GetPixelFormat() == PixelFormat1bppIndexed);
 
         BitmapData dataMask ;

-        interimMask.LockBits(&bounds,ImageLockModeRead, 
+        interimMask.LockBits(&bounds,ImageLockModeRead,

             interimMask.GetPixelFormat(),&dataMask);
 
 
             interimMask.GetPixelFormat(),&dataMask);
 
 


@@ -1054,7 +1022,7 @@ void wxGDIPlusContext::DrawBitmap( const wxBitmap &bmp, wxDouble x, wxDouble y,
     }
     else
     {
     }
     else
     {

-        image = Bitmap::FromHBITMAP((HBITMAP)bmp.GetHBITMAP(),(HPALETTE)bmp.GetPalette()->GetHPALETTE());        
+        image = Bitmap::FromHBITMAP((HBITMAP)bmp.GetHBITMAP(),(HPALETTE)bmp.GetPalette()->GetHPALETTE());

         if ( GetPixelFormatSize(image->GetPixelFormat()) == 32 )
         {
             size_t width = image->GetWidth();
         if ( GetPixelFormatSize(image->GetPixelFormat()) == 32 )
         {
             size_t width = image->GetWidth();


@@ -1067,7 +1035,7 @@ void wxGDIPlusContext::DrawBitmap( const wxBitmap &bmp, wxDouble x, wxDouble y,
             helper->LockBits(&bounds, ImageLockModeRead,
                 helper->GetPixelFormat(),&data);
 
             helper->LockBits(&bounds, ImageLockModeRead,
                 helper->GetPixelFormat(),&data);
 

-            image = new Bitmap(data.Width, data.Height, data.Stride, 
+            image = new Bitmap(data.Width, data.Height, data.Stride,

                 PixelFormat32bppARGB , (BYTE*) data.Scan0);
 
             helper->UnlockBits(&data);
                 PixelFormat32bppARGB , (BYTE*) data.Scan0);
 
             helper->UnlockBits(&data);


@@ -1079,7 +1047,7 @@ void wxGDIPlusContext::DrawBitmap( const wxBitmap &bmp, wxDouble x, wxDouble y,
     delete helper ;
 }
 
     delete helper ;
 }
 

-void wxGDIPlusContext::DrawIcon( const wxIcon &icon, wxDouble x, wxDouble y, wxDouble w, wxDouble h ) 
+void wxGDIPlusContext::DrawIcon( const wxIcon &icon, wxDouble x, wxDouble y, wxDouble w, wxDouble h )

 {
     HICON hIcon = (HICON)icon.GetHICON();
     ICONINFO iconInfo ;
 {
     HICON hIcon = (HICON)icon.GetHICON();
     ICONINFO iconInfo ;


@@ -1106,7 +1074,7 @@ void wxGDIPlusContext::DrawIcon( const wxIcon &icon, wxDouble x, wxDouble y, wxD
 
         interim.LockBits(&bounds, ImageLockModeRead,
             interim.GetPixelFormat(),&data);
 
         interim.LockBits(&bounds, ImageLockModeRead,
             interim.GetPixelFormat(),&data);

-        image = new Bitmap(data.Width, data.Height, data.Stride, 
+        image = new Bitmap(data.Width, data.Height, data.Stride,

             PixelFormat32bppARGB , (BYTE*) data.Scan0);
         interim.UnlockBits(&data);
     }
             PixelFormat32bppARGB , (BYTE*) data.Scan0);
         interim.UnlockBits(&data);
     }


@@ -1118,13 +1086,13 @@ void wxGDIPlusContext::DrawIcon( const wxIcon &icon, wxDouble x, wxDouble y, wxD
     DeleteObject(iconInfo.hbmMask);
 }
 
     DeleteObject(iconInfo.hbmMask);
 }
 

-void wxGDIPlusContext::DrawText( const wxString &str, wxDouble x, wxDouble y ) 
+void wxGDIPlusContext::DrawText( const wxString &str, wxDouble x, wxDouble y )

 {
     if ( m_font.IsNull() || str.IsEmpty())
         return ;
 
     wxWCharBuffer s = str.wc_str( *wxConvUI );
 {
     if ( m_font.IsNull() || str.IsEmpty())
         return ;
 
     wxWCharBuffer s = str.wc_str( *wxConvUI );

-    m_context->DrawString( s , -1 , ((wxGDIPlusFontData*)m_font.GetRefData())->GetGDIPlusFont() , 
+    m_context->DrawString( s , -1 , ((wxGDIPlusFontData*)m_font.GetRefData())->GetGDIPlusFont() ,

             PointF( x , y ) , ((wxGDIPlusFontData*)m_font.GetRefData())->GetGDIPlusBrush() );
     // TODO m_backgroundMode == wxSOLID
 }
             PointF( x , y ) , ((wxGDIPlusFontData*)m_font.GetRefData())->GetGDIPlusBrush() );
     // TODO m_backgroundMode == wxSOLID
 }


@@ -1135,7 +1103,7 @@ void wxGDIPlusContext::GetTextExtent( const wxString &str, wxDouble *width, wxDo
     wxWCharBuffer s = str.wc_str( *wxConvUI );
     FontFamily ffamily ;
     Font* f = ((wxGDIPlusFontData*)m_font.GetRefData())->GetGDIPlusFont();
     wxWCharBuffer s = str.wc_str( *wxConvUI );
     FontFamily ffamily ;
     Font* f = ((wxGDIPlusFontData*)m_font.GetRefData())->GetGDIPlusFont();

-    
+

     f->GetFamily(&ffamily) ;
 
     REAL factorY = m_context->GetDpiY() / 72.0 ;
     f->GetFamily(&ffamily) ;
 
     REAL factorY = m_context->GetDpiY() / 72.0 ;


@@ -1154,7 +1122,7 @@ void wxGDIPlusContext::GetTextExtent( const wxString &str, wxDouble *width, wxDo
     if ( externalLeading )
         *externalLeading = (rHeight - rAscent - rDescent) * factorY + 0.5 ;
     // measuring empty strings is not guaranteed, so do it by hand
     if ( externalLeading )
         *externalLeading = (rHeight - rAscent - rDescent) * factorY + 0.5 ;
     // measuring empty strings is not guaranteed, so do it by hand

-    if ( str.IsEmpty()) 
+    if ( str.IsEmpty())

     {
         if ( width )
             *width = 0 ;
     {
         if ( width )
             *width = 0 ;


@@ -1176,7 +1144,7 @@ void wxGDIPlusContext::GetTextExtent( const wxString &str, wxDouble *width, wxDo
     }
 }
 
     }
 }
 

-void wxGDIPlusContext::GetPartialTextExtents(const wxString& text, wxArrayDouble& widths) const 
+void wxGDIPlusContext::GetPartialTextExtents(const wxString& text, wxArrayDouble& widths) const

 {
     widths.Empty();
     widths.Add(0, text.length());
 {
     widths.Empty();
     widths.Add(0, text.length());


@@ -1210,27 +1178,29 @@ void wxGDIPlusContext::GetPartialTextExtents(const wxString& text, wxArrayDouble
     }
 }
 
     }
 }
 

-void* wxGDIPlusContext::GetNativeContext() 
+void* wxGDIPlusContext::GetNativeContext()

 {
 {

-       return m_context;
+    return m_context;

 }
 
 // concatenates this transform with the current transform of this context
 }
 
 // concatenates this transform with the current transform of this context

-void wxGDIPlusContext::ConcatTransform( const wxGraphicsMatrix* matrix )
+void wxGDIPlusContext::ConcatTransform( const wxGraphicsMatrix& matrix )

 {
 {

-    m_context->MultiplyTransform((Matrix*) matrix->GetNativeMatrix());
+    m_context->MultiplyTransform((Matrix*) matrix.GetNativeMatrix());

 }
 
 // sets the transform of this context
 }
 
 // sets the transform of this context

-void wxGDIPlusContext::SetTransform( const wxGraphicsMatrix* matrix )
+void wxGDIPlusContext::SetTransform( const wxGraphicsMatrix& matrix )

 {
 {

-    m_context->SetTransform((Matrix*) matrix->GetNativeMatrix());
+    m_context->SetTransform((Matrix*) matrix.GetNativeMatrix());

 }
 
 // gets the matrix of this context
 }
 
 // gets the matrix of this context

-void wxGDIPlusContext::GetTransform( wxGraphicsMatrix* matrix )
+wxGraphicsMatrix wxGDIPlusContext::GetTransform() const

 {
 {

-    m_context->GetTransform((Matrix*) matrix->GetNativeMatrix());
+    wxGraphicsMatrix matrix = CreateMatrix();
+    m_context->GetTransform((Matrix*) matrix.GetNativeMatrix());
+    return matrix;

 }
 //-----------------------------------------------------------------------------
 // wxGDIPlusRenderer declaration
 }
 //-----------------------------------------------------------------------------
 // wxGDIPlusRenderer declaration


@@ -1239,13 +1209,13 @@ void wxGDIPlusContext::GetTransform( wxGraphicsMatrix* matrix )
 class WXDLLIMPEXP_CORE wxGDIPlusRenderer : public wxGraphicsRenderer
 {
 public :
 class WXDLLIMPEXP_CORE wxGDIPlusRenderer : public wxGraphicsRenderer
 {
 public :

-    wxGDIPlusRenderer() 
+    wxGDIPlusRenderer()

     {
         m_loaded = false;
     {
         m_loaded = false;

-        m_gditoken = NULL;
+        m_gditoken = 0;

     }
 
     }
 

-    virtual ~wxGDIPlusRenderer() 
+    virtual ~wxGDIPlusRenderer()

     {
         if (m_loaded)
         {
     {
         if (m_loaded)
         {


@@ -1257,19 +1227,23 @@ public :
 
     virtual wxGraphicsContext * CreateContext( const wxWindowDC& dc);
 
 
     virtual wxGraphicsContext * CreateContext( const wxWindowDC& dc);
 

+    virtual wxGraphicsContext * CreateContext( const wxMemoryDC& dc);
+

     virtual wxGraphicsContext * CreateContextFromNativeContext( void * context );
 
     virtual wxGraphicsContext * CreateContextFromNativeWindow( void * window );
 
     virtual wxGraphicsContext * CreateContext( wxWindow* window );
 
     virtual wxGraphicsContext * CreateContextFromNativeContext( void * context );
 
     virtual wxGraphicsContext * CreateContextFromNativeWindow( void * window );
 
     virtual wxGraphicsContext * CreateContext( wxWindow* window );
 

+    virtual wxGraphicsContext * CreateMeasuringContext();
+

     // Path
 
     // Path
 

-    virtual wxGraphicsPath * CreatePath();
+    virtual wxGraphicsPath CreatePath();

 
     // Matrix
 
 
     // Matrix
 

-    virtual wxGraphicsMatrix * CreateMatrix( wxDouble a=1.0, wxDouble b=0.0, wxDouble c=0.0, wxDouble d=1.0, 
+    virtual wxGraphicsMatrix CreateMatrix( wxDouble a=1.0, wxDouble b=0.0, wxDouble c=0.0, wxDouble d=1.0,

         wxDouble tx=0.0, wxDouble ty=0.0);
 
 
         wxDouble tx=0.0, wxDouble ty=0.0);
 
 


@@ -1278,10 +1252,10 @@ public :
     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 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) ;
 
         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) 
+    // sets the brush to a radial gradient originating at (xo,yc) with color oColor and ends on a circle around (xc,yc)

     // with radius r and color cColor
     virtual wxGraphicsBrush CreateRadialGradientBrush( wxDouble xo, wxDouble yo, wxDouble xc, wxDouble yc, wxDouble radius,
         const wxColour &oColor, const wxColour &cColor) ;
     // with radius r and color cColor
     virtual wxGraphicsBrush CreateRadialGradientBrush( wxDouble xo, wxDouble yo, wxDouble xc, wxDouble yc, wxDouble radius,
         const wxColour &oColor, const wxColour &cColor) ;


@@ -1295,7 +1269,7 @@ protected :
 
 private :
     bool m_loaded;
 
 private :
     bool m_loaded;

-    DWORD m_gditoken;
+    ULONG_PTR m_gditoken;

 
     DECLARE_DYNAMIC_CLASS_NO_COPY(wxGDIPlusRenderer)
 } ;
 
     DECLARE_DYNAMIC_CLASS_NO_COPY(wxGDIPlusRenderer)
 } ;


@@ -1341,6 +1315,20 @@ wxGraphicsContext * wxGDIPlusRenderer::CreateContext( const wxWindowDC& dc)
     return new wxGDIPlusContext(this,(HDC) dc.GetHDC());
 }
 
     return new wxGDIPlusContext(this,(HDC) dc.GetHDC());
 }
 

+wxGraphicsContext * wxGDIPlusRenderer::CreateContext( const wxMemoryDC& dc)
+{
+    EnsureIsLoaded();
+    return new wxGDIPlusContext(this,(HDC) dc.GetHDC());
+}
+
+wxGraphicsContext * wxGDIPlusRenderer::CreateMeasuringContext()
+{
+    EnsureIsLoaded();
+    return NULL;
+    // TODO use GetDC(NULL) but then we have to release it from the context
+    //return new wxGDIPlusContext(this,(HDC) dc.GetHDC());
+}
+

 wxGraphicsContext * wxGDIPlusRenderer::CreateContextFromNativeContext( void * context )
 {
     EnsureIsLoaded();
 wxGraphicsContext * wxGDIPlusRenderer::CreateContextFromNativeContext( void * context )
 {
     EnsureIsLoaded();


@@ -1362,26 +1350,30 @@ wxGraphicsContext * wxGDIPlusRenderer::CreateContext( wxWindow* window )
 
 // Path
 
 
 // Path
 

-wxGraphicsPath * wxGDIPlusRenderer::CreatePath()
+wxGraphicsPath wxGDIPlusRenderer::CreatePath()

 {
     EnsureIsLoaded();
 {
     EnsureIsLoaded();

-    return new wxGDIPlusPath( this );
+    wxGraphicsPath m;
+    m.SetRefData( new wxGDIPlusPathData(this));
+    return m;

 }
 
 
 // Matrix
 
 }
 
 
 // Matrix
 

-wxGraphicsMatrix * wxGDIPlusRenderer::CreateMatrix( wxDouble a, wxDouble b, wxDouble c, wxDouble d, 
+wxGraphicsMatrix wxGDIPlusRenderer::CreateMatrix( wxDouble a, wxDouble b, wxDouble c, wxDouble d,

                                                            wxDouble tx, wxDouble ty)
 
 {
     EnsureIsLoaded();
                                                            wxDouble tx, wxDouble ty)
 
 {
     EnsureIsLoaded();

-    wxGDIPlusMatrix* m = new wxGDIPlusMatrix( this );
-    m->Set( a,b,c,d,tx,ty ) ;
+    wxGraphicsMatrix m;
+    wxGDIPlusMatrixData* data = new wxGDIPlusMatrixData( this );
+    data->Set( a,b,c,d,tx,ty ) ;
+    m.SetRefData(data);

     return m;
 }
 
     return m;
 }
 

-wxGraphicsPen wxGDIPlusRenderer::CreatePen(const wxPen& pen) 
+wxGraphicsPen wxGDIPlusRenderer::CreatePen(const wxPen& pen)

 {
     EnsureIsLoaded();
     if ( !pen.Ok() || pen.GetStyle() == wxTRANSPARENT )
 {
     EnsureIsLoaded();
     if ( !pen.Ok() || pen.GetStyle() == wxTRANSPARENT )


@@ -1394,7 +1386,7 @@ wxGraphicsPen wxGDIPlusRenderer::CreatePen(const wxPen& pen)
     }
 }
 
     }
 }
 

-wxGraphicsBrush wxGDIPlusRenderer::CreateBrush(const wxBrush& brush ) 
+wxGraphicsBrush wxGDIPlusRenderer::CreateBrush(const wxBrush& brush )

 {
     EnsureIsLoaded();
     if ( !brush.Ok() || brush.GetStyle() == wxTRANSPARENT )
 {
     EnsureIsLoaded();
     if ( !brush.Ok() || brush.GetStyle() == wxTRANSPARENT )


@@ -1408,8 +1400,8 @@ wxGraphicsBrush wxGDIPlusRenderer::CreateBrush(const wxBrush& brush )
 }
 
 // sets the brush to a linear gradient, starting at (x1,y1) with color c1 to (x2,y2) with color c2
 }
 
 // sets the brush to a linear gradient, starting at (x1,y1) with color c1 to (x2,y2) with color c2

-wxGraphicsBrush wxGDIPlusRenderer::CreateLinearGradientBrush( wxDouble x1, wxDouble y1, wxDouble x2, wxDouble y2, 
-                                                                      const wxColour&c1, const wxColour&c2) 
+wxGraphicsBrush wxGDIPlusRenderer::CreateLinearGradientBrush( wxDouble x1, wxDouble y1, wxDouble x2, wxDouble y2,
+                                                                      const wxColour&c1, const wxColour&c2)

 {
     EnsureIsLoaded();
     wxGraphicsBrush p;
 {
     EnsureIsLoaded();
     wxGraphicsBrush p;


@@ -1419,10 +1411,10 @@ wxGraphicsBrush wxGDIPlusRenderer::CreateLinearGradientBrush( wxDouble x1, wxDou
     return p;
  }
 
     return p;
  }
 

-// sets the brush to a radial gradient originating at (xo,yc) with color oColor and ends on a circle around (xc,yc) 
+// sets the brush to a radial gradient originating at (xo,yc) with color oColor and ends on a circle around (xc,yc)

 // with radius r and color cColor
 wxGraphicsBrush wxGDIPlusRenderer::CreateRadialGradientBrush( wxDouble xo, wxDouble yo, wxDouble xc, wxDouble yc, wxDouble radius,
 // with radius r and color cColor
 wxGraphicsBrush wxGDIPlusRenderer::CreateRadialGradientBrush( wxDouble xo, wxDouble yo, wxDouble xc, wxDouble yc, wxDouble radius,

-                                                                      const wxColour &oColor, const wxColour &cColor) 
+                                                                      const wxColour &oColor, const wxColour &cColor)

 {
     EnsureIsLoaded();
     wxGraphicsBrush p;
 {
     EnsureIsLoaded();
     wxGraphicsBrush p;


@@ -1433,11 +1425,11 @@ wxGraphicsBrush wxGDIPlusRenderer::CreateRadialGradientBrush( wxDouble xo, wxDou
 }
 
 // sets the font
 }
 
 // sets the font

-wxGraphicsFont wxGDIPlusRenderer::CreateFont( const wxFont &font , const wxColour &col ) 
+wxGraphicsFont wxGDIPlusRenderer::CreateFont( const wxFont &font , const wxColour &col )

 {
     EnsureIsLoaded();
     if ( font.Ok() )
 {
     EnsureIsLoaded();
     if ( font.Ok() )

-    {        
+    {

         wxGraphicsFont p;
         p.SetRefData(new wxGDIPlusFontData( this , font, col ));
         return p;
         wxGraphicsFont p;
         p.SetRefData(new wxGDIPlusFontData( this , font, col ));
         return p;