don't refresh the current cell in SetCellHighlightROPenWidth() if it's invalid (...

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

diff --git a/src/msw/graphics.cpp b/src/msw/graphics.cpp
index 520da0e709c5ac0c31d0888e854f5c661edb90ce..e2b875612a1b814f4299ab90a8ecbbfe9c38d46f 100644 (file)
--- a/src/msw/graphics.cpp
+++ b/src/msw/graphics.cpp
@@ -17,29 +17,31 @@
 #pragma hdrstop
 #endif
 
 #pragma hdrstop
 #endif
 

+#if wxUSE_GRAPHICS_CONTEXT
+

 #ifndef WX_PRECOMP
 #ifndef WX_PRECOMP

-#include "wx/msw/wrapcdlg.h"
-#include "wx/image.h"
-#include "wx/window.h"
-#include "wx/dc.h"
-#include "wx/utils.h"
-#include "wx/dialog.h"
-#include "wx/app.h"
-#include "wx/bitmap.h"
-#include "wx/dcmemory.h"
-#include "wx/log.h"
-#include "wx/icon.h"
-#include "wx/dcprint.h"
-#include "wx/module.h"
+    #include "wx/msw/wrapcdlg.h"
+    #include "wx/image.h"
+    #include "wx/window.h"
+    #include "wx/dc.h"
+    #include "wx/utils.h"
+    #include "wx/dialog.h"
+    #include "wx/app.h"
+    #include "wx/bitmap.h"
+    #include "wx/dcmemory.h"
+    #include "wx/log.h"
+    #include "wx/icon.h"
+    #include "wx/dcprint.h"
+    #include "wx/module.h"

 #endif
 
 #endif
 

-#include "wx/graphics.h"
-
-#if wxUSE_GRAPHICS_CONTEXT
+#include "wx/private/graphics.h"
+#include "wx/msw/wrapgdip.h"
+#include "wx/msw/dc.h"

 
 

-#include <vector>
+#include "wx/stack.h"

 
 

-using namespace std;
+WX_DECLARE_STACK(GraphicsState, GraphicsStates);

 
 //-----------------------------------------------------------------------------
 // constants
 
 //-----------------------------------------------------------------------------
 // constants


@@ -79,27 +81,13 @@ static inline double RadToDeg(double deg) { return (deg * 180.0) / M_PI; }
 #include <commdlg.h>
 #endif
 
 #include <commdlg.h>
 #endif
 

-// TODO remove this dependency (gdiplus needs the macros)
-
-#ifndef max
-#define max(a,b)            (((a) > (b)) ? (a) : (b))
-#endif
-
-#ifndef min
-#define min(a,b)            (((a) < (b)) ? (a) : (b))
-#endif
-
-#include "gdiplus.h"
-using namespace Gdiplus;
-
-class WXDLLIMPEXP_CORE wxGDIPlusPath : public wxGraphicsPath
+class 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 +96,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 +131,51 @@ 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 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);
 
         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 ?
     // 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,27 +188,25 @@ 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 wxGDIPlusPenData : public wxGraphicsObjectRefData

 {
 public:
     wxGDIPlusPenData( wxGraphicsRenderer* renderer, const wxPen &pen );
 {
 public:
     wxGDIPlusPenData( wxGraphicsRenderer* renderer, const wxPen &pen );


@@ -241,14 +225,14 @@ protected :
     wxDouble m_width;
 };
 
     wxDouble m_width;
 };
 

-class WXDLLIMPEXP_CORE wxGDIPlusBrushData : public wxGraphicsObjectRefData
+class wxGDIPlusBrushData : public wxGraphicsObjectRefData

 {
 public:
     wxGDIPlusBrushData( wxGraphicsRenderer* renderer );
     wxGDIPlusBrushData( wxGraphicsRenderer* renderer, const wxBrush &brush );
     ~wxGDIPlusBrushData ();
 
 {
 public:
     wxGDIPlusBrushData( wxGraphicsRenderer* renderer );
     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 );


@@ -263,7 +247,21 @@ private :
     GraphicsPath* m_brushPath;
 };
 
     GraphicsPath* m_brushPath;
 };
 

-class WXDLLIMPEXP_CORE wxGDIPlusFontData : public wxGraphicsObjectRefData
+class WXDLLIMPEXP_CORE wxGDIPlusBitmapData : public wxGraphicsObjectRefData
+{
+public:
+    wxGDIPlusBitmapData( wxGraphicsRenderer* renderer, Bitmap* bitmap );
+    wxGDIPlusBitmapData( wxGraphicsRenderer* renderer, const wxBitmap &bmp );
+    ~wxGDIPlusBitmapData ();
+
+    virtual Bitmap* GetGDIPlusBitmap() { return m_bitmap; }
+
+private :
+    Bitmap* m_bitmap;
+    Bitmap* m_helper;
+};
+
+class wxGDIPlusFontData : public wxGraphicsObjectRefData

 {
 public:
     wxGDIPlusFontData( wxGraphicsRenderer* renderer, const wxFont &font, const wxColour& col );
 {
 public:
     wxGDIPlusFontData( wxGraphicsRenderer* renderer, const wxFont &font, const wxColour& col );


@@ -276,7 +274,7 @@ private :
     Font* m_font;
 };
 
     Font* m_font;
 };
 

-class WXDLLIMPEXP_CORE wxGDIPlusContext : public wxGraphicsContext
+class wxGDIPlusContext : public wxGraphicsContext

 {
 public:
     wxGDIPlusContext( wxGraphicsRenderer* renderer, HDC hdc );
 {
 public:
     wxGDIPlusContext( wxGraphicsRenderer* renderer, HDC hdc );


@@ -289,50 +287,78 @@ 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 );
+
+       // stroke lines connecting each of the points
+    virtual void StrokeLines( size_t n, const wxPoint2DDouble *points);
+
+    // draws a polygon
+    virtual void DrawLines( size_t n, const wxPoint2DDouble *points, 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 wxGraphicsBitmap &bmp, 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 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 GetTextExtent( const wxString &str, wxDouble *width, wxDouble *height,
         wxDouble *descent, wxDouble *externalLeading ) const;
     virtual void GetPartialTextExtents(const wxString& text, wxArrayDouble& widths) const;
     virtual void PopState();
 
     virtual void DrawText( const wxString &str, wxDouble x, wxDouble y);
     virtual void GetTextExtent( const wxString &str, wxDouble *width, wxDouble *height,
         wxDouble *descent, wxDouble *externalLeading ) const;
     virtual void GetPartialTextExtents(const wxString& text, wxArrayDouble& widths) const;

+    virtual bool ShouldOffset() const;

 
 private:
     void    Init();
     void    SetDefaults();
 
     Graphics* m_context;
 
 private:
     void    Init();
     void    SetDefaults();
 
     Graphics* m_context;

-    vector<GraphicsState> m_stateStack;
+    GraphicsStates m_stateStack;

     GraphicsState m_state1;
     GraphicsState m_state2;
 
     DECLARE_DYNAMIC_CLASS_NO_COPY(wxGDIPlusContext)
 };
 
     GraphicsState m_state1;
     GraphicsState m_state2;
 
     DECLARE_DYNAMIC_CLASS_NO_COPY(wxGDIPlusContext)
 };
 

+class WXDLLIMPEXP_CORE wxGDIPlusMeasuringContext : public wxGDIPlusContext
+{
+public:
+    wxGDIPlusMeasuringContext( wxGraphicsRenderer* renderer ) : wxGDIPlusContext( renderer , m_hdc = GetDC(NULL) )
+    {
+    }
+    wxGDIPlusMeasuringContext()
+    {
+    }
+
+    virtual ~wxGDIPlusMeasuringContext()
+    {
+        ReleaseDC( NULL, m_hdc );
+    }
+
+private:
+    HDC m_hdc ;
+    DECLARE_DYNAMIC_CLASS_NO_COPY(wxGDIPlusMeasuringContext)
+} ;
+

 //-----------------------------------------------------------------------------
 // wxGDIPlusPen implementation
 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------
 // wxGDIPlusPen implementation
 //-----------------------------------------------------------------------------


@@ -353,7 +379,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 +514,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 +566,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 +592,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 +620,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;


@@ -620,59 +646,158 @@ wxGDIPlusFontData::~wxGDIPlusFontData()
     delete m_font;
 }
 
     delete m_font;
 }
 

+// 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, since there is no real copying of the data going in, only references are stored
+// m_helper has to be kept alive as well
+

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

-// wxGDIPlusPath implementation
+// wxGDIPlusBitmapData implementation

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

-IMPLEMENT_DYNAMIC_CLASS(wxGDIPlusPath,wxGraphicsPath)
+wxGDIPlusBitmapData::wxGDIPlusBitmapData( wxGraphicsRenderer* renderer, Bitmap* bitmap ) :
+    wxGraphicsObjectRefData( renderer ), m_bitmap( bitmap )
+{
+    m_helper = NULL;
+}

 
 

-wxGDIPlusPath::wxGDIPlusPath(wxGraphicsRenderer* renderer, GraphicsPath* path ) : wxGraphicsPath(renderer)
+wxGDIPlusBitmapData::wxGDIPlusBitmapData( wxGraphicsRenderer* renderer, 
+                        const wxBitmap &bmp) : wxGraphicsObjectRefData( renderer )

 {
 {

-    if ( path )
-        m_path = path;
+    m_bitmap = NULL;
+    m_helper = NULL;
+
+    Bitmap* image = NULL;
+    if ( bmp.GetMask() )
+    {
+        Bitmap interim((HBITMAP)bmp.GetHBITMAP(),(HPALETTE)bmp.GetPalette()->GetHPALETTE()) ;
+
+        size_t width = interim.GetWidth();
+        size_t height = interim.GetHeight();
+        Rect bounds(0,0,width,height);
+
+        image = new Bitmap(width,height,PixelFormat32bppPARGB) ;
+
+        Bitmap interimMask((HBITMAP)bmp.GetMask()->GetMaskBitmap(),NULL);
+        wxASSERT(interimMask.GetPixelFormat() == PixelFormat1bppIndexed);
+
+        BitmapData dataMask ;
+        interimMask.LockBits(&bounds,ImageLockModeRead,
+            interimMask.GetPixelFormat(),&dataMask);
+
+
+        BitmapData imageData ;
+        image->LockBits(&bounds,ImageLockModeWrite, PixelFormat32bppPARGB, &imageData);
+
+        BYTE maskPattern = 0 ;
+        BYTE maskByte = 0;
+        size_t maskIndex ;
+
+        for ( size_t y = 0 ; y < height ; ++y)
+        {
+            maskIndex = 0 ;
+            for( size_t x = 0 ; x < width; ++x)
+            {
+                if ( x % 8 == 0)
+                {
+                    maskPattern = 0x80;
+                    maskByte = *((BYTE*)dataMask.Scan0 + dataMask.Stride*y + maskIndex);
+                    maskIndex++;
+                }
+                else
+                    maskPattern = maskPattern >> 1;
+
+                ARGB *dest = (ARGB*)((BYTE*)imageData.Scan0 + imageData.Stride*y + x*4);
+                if ( (maskByte & maskPattern) == 0 )
+                    *dest = 0x00000000;
+                else
+                {
+                    Color c ;
+                    interim.GetPixel(x,y,&c) ;
+                    *dest = (c.GetValue() | Color::AlphaMask);
+                }
+            }
+        }
+
+        image->UnlockBits(&imageData);
+
+        interimMask.UnlockBits(&dataMask);
+        interim.UnlockBits(&dataMask);
+    }

     else
     else

-        m_path = new GraphicsPath();
+    {
+        image = Bitmap::FromHBITMAP((HBITMAP)bmp.GetHBITMAP(),(HPALETTE)bmp.GetPalette()->GetHPALETTE());
+        if ( bmp.HasAlpha() && GetPixelFormatSize(image->GetPixelFormat()) == 32 )
+        {
+            size_t width = image->GetWidth();
+            size_t height = image->GetHeight();
+            Rect bounds(0,0,width,height);
+            static BitmapData data ;
+
+            m_helper = image ;
+            image = NULL ;
+            m_helper->LockBits(&bounds, ImageLockModeRead,
+                m_helper->GetPixelFormat(),&data);
+
+            image = new Bitmap(data.Width, data.Height, data.Stride,
+                PixelFormat32bppPARGB , (BYTE*) data.Scan0);
+
+            m_helper->UnlockBits(&data);
+        }
+    }
+    if ( image )
+        m_bitmap = image;

 }
 
 }
 

-wxGDIPlusPath::wxGDIPlusPath() : wxGraphicsPath(NULL)
+wxGDIPlusBitmapData::~wxGDIPlusBitmapData()

 {
 {

-    wxLogDebug(wxT("Illegal Constructor called"));
+    delete m_bitmap;
+    delete m_helper;

 }
 
 }
 

+//-----------------------------------------------------------------------------
+// wxGDIPlusPath implementation
+//-----------------------------------------------------------------------------

 
 

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

 {
 {

-    delete m_path;
+    if ( path )
+        m_path = path;
+    else
+        m_path = new GraphicsPath();

 }
 
 }
 

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

 {
 {

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

 }
 
 }
 

-
+wxGraphicsObjectRefData* wxGDIPlusPathData::Clone() const
+{
+    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,18 +808,18 @@ 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 ;
 {
     double sweepAngle = endAngle - startAngle ;

-    if( abs(sweepAngle) >= 2*M_PI)
+    if( fabs(sweepAngle) >= 2*M_PI)

     {
         sweepAngle = 2 * M_PI;
     }
     {
         sweepAngle = 2 * M_PI;
     }


@@ -712,28 +837,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 +868,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 +887,57 @@ 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);
 }
 
                  wxDouble tx, wxDouble ty)
 {
     m_matrix->SetElements(a,b,c,d,tx,ty);
 }
 

+// gets the component valuess of the matrix
+void wxGDIPlusMatrixData::Get(wxDouble* a, wxDouble* b,  wxDouble* c,
+                              wxDouble* d, wxDouble* tx, wxDouble* ty) const
+{
+    REAL elements[6];
+    m_matrix->GetElements(elements);
+    if (a)  *a = elements[0];
+    if (b)  *b = elements[1];
+    if (c)  *c = elements[2];
+    if (d)  *d = elements[3];
+    if (tx) *tx= elements[4];
+    if (ty) *ty= elements[5];
+}
+

 // makes this the inverse matrix
 // 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 +947,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 +969,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 +978,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 +987,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;
 }


@@ -872,8 +997,29 @@ void * wxGDIPlusMatrix::GetNativeMatrix() const
 //-----------------------------------------------------------------------------
 
 IMPLEMENT_DYNAMIC_CLASS(wxGDIPlusContext,wxGraphicsContext)
 //-----------------------------------------------------------------------------
 
 IMPLEMENT_DYNAMIC_CLASS(wxGDIPlusContext,wxGraphicsContext)

+IMPLEMENT_DYNAMIC_CLASS(wxGDIPlusMeasuringContext,wxGDIPlusContext)
+
+class wxGDIPlusOffsetHelper
+{
+public :
+    wxGDIPlusOffsetHelper( Graphics* gr , bool offset )
+    {
+        m_gr = gr;
+        m_offset = offset;
+        if ( m_offset )
+            m_gr->TranslateTransform( 0.5, 0.5 );
+    }
+    ~wxGDIPlusOffsetHelper( )
+    {
+        if ( m_offset )
+            m_gr->TranslateTransform( -0.5, -0.5 );
+    }
+public :
+    Graphics* m_gr;
+    bool m_offset;
+} ;

 
 

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

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


@@ -911,6 +1057,8 @@ void wxGDIPlusContext::Init()
 
 void wxGDIPlusContext::SetDefaults()
 {
 
 void wxGDIPlusContext::SetDefaults()
 {

+    m_context->SetTextRenderingHint(TextRenderingHintSystemDefault);
+    m_context->SetPixelOffsetMode(PixelOffsetModeHalf);

     m_context->SetSmoothingMode(SmoothingModeHighQuality);
     m_state1 = m_context->Save();
     m_state2 = m_context->Save();
     m_context->SetSmoothingMode(SmoothingModeHighQuality);
     m_state1 = m_context->Save();
     m_state2 = m_context->Save();


@@ -929,43 +1077,80 @@ 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::StrokeLines( size_t n, const wxPoint2DDouble *points)
+{
+       if ( !m_pen.IsNull() )
+       {
+        wxGDIPlusOffsetHelper helper( m_context , ShouldOffset() );
+               Point *cpoints = new Point[n];
+               for (size_t i = 0; i < n; i++)
+               {
+                       cpoints[i].X = (int)(points[i].m_x );
+                       cpoints[i].Y = (int)(points[i].m_y );
+
+               } // for (size_t i = 0; i < n; i++)
+               m_context->DrawLines( ((wxGDIPlusPenData*)m_pen.GetGraphicsData())->GetGDIPlusPen() , cpoints , n ) ;
+               delete[] cpoints;
+       }
+}
+
+void wxGDIPlusContext::DrawLines( size_t n, const wxPoint2DDouble *points, int WXUNUSED(fillStyle) )
+{
+    wxGDIPlusOffsetHelper helper( m_context , ShouldOffset() );
+       Point *cpoints = new Point[n];
+       for (size_t i = 0; i < n; i++)
+       {
+               cpoints[i].X = (int)(points[i].m_x );
+               cpoints[i].Y = (int)(points[i].m_y );
+
+       } // for (int i = 0; i < n; i++)
+       if ( !m_brush.IsNull() )
+               m_context->FillPolygon( ((wxGDIPlusBrushData*)m_brush.GetRefData())->GetGDIPlusBrush() , cpoints , n ) ;
+       if ( !m_pen.IsNull() )
+               m_context->DrawLines( ((wxGDIPlusPenData*)m_pen.GetGraphicsData())->GetGDIPlusPen() , cpoints , n ) ;
+       delete[] cpoints;
+}
+
+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() );
+        wxGDIPlusOffsetHelper helper( m_context , ShouldOffset() );
+        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());
+        wxGDIPlusOffsetHelper helper( m_context , ShouldOffset() );
+        ((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 );
 }


@@ -978,121 +1163,55 @@ void wxGDIPlusContext::Scale( wxDouble xScale , wxDouble yScale )
 void wxGDIPlusContext::PushState()
 {
     GraphicsState state = m_context->Save();
 void wxGDIPlusContext::PushState()
 {
     GraphicsState state = m_context->Save();

-    m_stateStack.push_back(state);
+    m_stateStack.push(state);

 }
 
 }
 

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

 {
 {

-    GraphicsState state = m_stateStack.back();
-    m_stateStack.pop_back();
+    GraphicsState state = m_stateStack.top();
+    m_stateStack.pop();

     m_context->Restore(state);
 }
 
     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 
-// bytes as parameter
-
-void wxGDIPlusContext::DrawBitmap( const wxBitmap &bmp, wxDouble x, wxDouble y, wxDouble w, wxDouble h ) 
+void wxGDIPlusContext::DrawBitmap( const wxGraphicsBitmap &bmp, wxDouble x, wxDouble y, wxDouble w, wxDouble h )

 {
 {

-    Bitmap* image = NULL;
-    Bitmap* helper = NULL;
-    if ( bmp.GetMask() )
-    { 
-        Bitmap interim((HBITMAP)bmp.GetHBITMAP(),(HPALETTE)bmp.GetPalette()->GetHPALETTE()) ;
-
-        size_t width = interim.GetWidth();
-        size_t height = interim.GetHeight();
-        Rect bounds(0,0,width,height);
-
-        image = new Bitmap(width,height,PixelFormat32bppPARGB) ;
-
-        Bitmap interimMask((HBITMAP)bmp.GetMask()->GetMaskBitmap(),NULL);
-        wxASSERT(interimMask.GetPixelFormat() == PixelFormat1bppIndexed);
-
-        BitmapData dataMask ;
-        interimMask.LockBits(&bounds,ImageLockModeRead, 
-            interimMask.GetPixelFormat(),&dataMask);
-
-
-        BitmapData imageData ;
-        image->LockBits(&bounds,ImageLockModeWrite, PixelFormat32bppPARGB, &imageData);
-
-        BYTE maskPattern = 0 ;
-        BYTE maskByte = 0;
-        size_t maskIndex ;
-
-        for ( size_t y = 0 ; y < height ; ++y)
-        {
-            maskIndex = 0 ;
-            for( size_t x = 0 ; x < width; ++x)
-            {
-                if ( x % 8 == 0)
-                {
-                    maskPattern = 0x80;
-                    maskByte = *((BYTE*)dataMask.Scan0 + dataMask.Stride*y + maskIndex);
-                    maskIndex++;
-                }
-                else
-                    maskPattern = maskPattern >> 1;
-
-                ARGB *dest = (ARGB*)((BYTE*)imageData.Scan0 + imageData.Stride*y + x*4);
-                if ( (maskByte & maskPattern) == 0 )
-                    *dest = 0x00000000;
-                else
-                {
-                    Color c ;
-                    interim.GetPixel(x,y,&c) ;
-                    *dest = (c.GetValue() | Color::AlphaMask);
-                }
-            }
-        }
-
-        image->UnlockBits(&imageData);
-
-        interimMask.UnlockBits(&dataMask);
-        interim.UnlockBits(&dataMask);
-    }
-    else
+    Bitmap* image = static_cast<wxGDIPlusBitmapData*>(bmp.GetRefData())->GetGDIPlusBitmap();
+    if ( image )

     {
     {

-        image = Bitmap::FromHBITMAP((HBITMAP)bmp.GetHBITMAP(),(HPALETTE)bmp.GetPalette()->GetHPALETTE());        
-        if ( GetPixelFormatSize(image->GetPixelFormat()) == 32 )
+        if( image->GetWidth() != (UINT) w || image->GetHeight() != (UINT) h )

         {
         {

-            size_t width = image->GetWidth();
-            size_t height = image->GetHeight();
-            Rect bounds(0,0,width,height);
-            BitmapData data ;
-
-            helper = image ;
-            image = NULL ;
-            helper->LockBits(&bounds, ImageLockModeRead,
-                helper->GetPixelFormat(),&data);
-
-            image = new Bitmap(data.Width, data.Height, data.Stride, 
-                PixelFormat32bppARGB , (BYTE*) data.Scan0);
-
-            helper->UnlockBits(&data);
+            Rect drawRect((REAL) x, (REAL)y, (REAL)w, (REAL)h);
+            m_context->SetPixelOffsetMode( PixelOffsetModeNone );
+            m_context->DrawImage(image, drawRect, 0 , 0 , image->GetWidth()-1, image->GetHeight()-1, UnitPixel ) ;
+            m_context->SetPixelOffsetMode( PixelOffsetModeHalf );

         }
         }

+        else
+            m_context->DrawImage(image,(REAL) x,(REAL) y,(REAL) w,(REAL) h) ;

     }
     }

-    if ( image )
-        m_context->DrawImage(image,(REAL) x,(REAL) y,(REAL) w,(REAL) h) ;
-    delete image ;
-    delete helper ;

 }
 
 }
 

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

 {
 {

+    wxGraphicsBitmap bitmap = GetRenderer()->CreateBitmap(bmp);
+    DrawBitmap(bitmap, x, y, w, h);
+}
+
+void wxGDIPlusContext::DrawIcon( const wxIcon &icon, wxDouble x, wxDouble y, wxDouble w, wxDouble h )
+{
+    // the built-in conversion fails when there is alpha in the HICON (eg XP style icons), we can only
+    // find out by looking at the bitmap data whether there really was alpha in it

     HICON hIcon = (HICON)icon.GetHICON();
     ICONINFO iconInfo ;
     // IconInfo creates the bitmaps for color and mask, we must dispose of them after use
     if (!GetIconInfo(hIcon,&iconInfo))
         return;
 
     HICON hIcon = (HICON)icon.GetHICON();
     ICONINFO iconInfo ;
     // IconInfo creates the bitmaps for color and mask, we must dispose of them after use
     if (!GetIconInfo(hIcon,&iconInfo))
         return;
 

-    BITMAP iconBmpData ;
-    GetObject(iconInfo.hbmColor,sizeof(BITMAP),&iconBmpData);

     Bitmap interim(iconInfo.hbmColor,NULL);
 
     Bitmap* image = NULL ;
 
     Bitmap interim(iconInfo.hbmColor,NULL);
 
     Bitmap* image = NULL ;
 

+    // if it's not 32 bit, it doesn't have an alpha channel, note that since the conversion doesn't
+    // work correctly, asking IsAlphaPixelFormat at this point fails as well

     if( GetPixelFormatSize(interim.GetPixelFormat())!= 32 )
     {
         image = Bitmap::FromHICON(hIcon);
     if( GetPixelFormatSize(interim.GetPixelFormat())!= 32 )
     {
         image = Bitmap::FromHICON(hIcon);


@@ -1106,8 +1225,28 @@ 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, 
+        
+        bool hasAlpha = false;
+        for ( size_t y = 0 ; y < height && !hasAlpha ; ++y)
+        {
+            for( size_t x = 0 ; x < width && !hasAlpha; ++x)
+            {
+                ARGB *dest = (ARGB*)((BYTE*)data.Scan0 + data.Stride*y + x*4);
+                if ( ( *dest & Color::AlphaMask ) != 0 )
+                    hasAlpha = true;
+            }
+        }
+
+        if ( hasAlpha )
+        {
+        image = new Bitmap(data.Width, data.Height, data.Stride,

             PixelFormat32bppARGB , (BYTE*) data.Scan0);
             PixelFormat32bppARGB , (BYTE*) data.Scan0);

+        }
+        else
+        {
+            image = Bitmap::FromHICON(hIcon);
+        }
+

         interim.UnlockBits(&data);
     }
 
         interim.UnlockBits(&data);
     }
 


@@ -1118,15 +1257,14 @@ 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() , 
-            PointF( x , y ) , ((wxGDIPlusFontData*)m_font.GetRefData())->GetGDIPlusBrush() );
-    // TODO m_backgroundMode == wxSOLID
+    m_context->DrawString( s , -1 , ((wxGDIPlusFontData*)m_font.GetRefData())->GetGDIPlusFont() ,
+            PointF( x , y ) , StringFormat::GenericTypographic() , ((wxGDIPlusFontData*)m_font.GetRefData())->GetGDIPlusBrush() );

 }
 
 void wxGDIPlusContext::GetTextExtent( const wxString &str, wxDouble *width, wxDouble *height,
 }
 
 void wxGDIPlusContext::GetTextExtent( const wxString &str, wxDouble *width, wxDouble *height,


@@ -1135,7 +1273,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 ;


@@ -1148,35 +1286,31 @@ void wxGDIPlusContext::GetTextExtent( const wxString &str, wxDouble *width, wxDo
         f->GetSize() / ffamily.GetEmHeight(FontStyleRegular);
 
     if ( height )
         f->GetSize() / ffamily.GetEmHeight(FontStyleRegular);
 
     if ( height )

-        *height = rHeight * factorY + 0.5 ;
+        *height = rHeight * factorY;

     if ( descent )
     if ( descent )

-        *descent = rDescent * factorY + 0.5 ;
+        *descent = rDescent * factorY;

     if ( externalLeading )
     if ( externalLeading )

-        *externalLeading = (rHeight - rAscent - rDescent) * factorY + 0.5 ;
+        *externalLeading = (rHeight - rAscent - rDescent) * factorY;

     // measuring empty strings is not guaranteed, so do it by hand
     // measuring empty strings is not guaranteed, so do it by hand

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

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

-        // MeasureString does return a rectangle that is way too large, so it is
-        // not usable here

         RectF layoutRect(0,0, 100000.0f, 100000.0f);
         RectF layoutRect(0,0, 100000.0f, 100000.0f);

-        StringFormat strFormat;
-        CharacterRange strRange(0,wcslen(s));
-        strFormat.SetMeasurableCharacterRanges(1,&strRange);
-        Region region ;
-        m_context->MeasureCharacterRanges(s, -1 , f,layoutRect, &strFormat,1,&region) ;
-        RectF bbox ;
-        region.GetBounds(&bbox,m_context);
+        StringFormat strFormat( StringFormat::GenericTypographic() );
+        strFormat.SetFormatFlags( StringFormatFlagsMeasureTrailingSpaces | strFormat.GetFormatFlags() ); 
+
+        RectF bounds ;
+        m_context->MeasureString((const wchar_t *) s , wcslen(s) , f, layoutRect, &strFormat, &bounds ) ;

         if ( width )
         if ( width )

-            *width = bbox.GetRight()-bbox.GetLeft()+0.5;
+            *width = bounds.Width;

     }
 }
 
     }
 }
 

-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());


@@ -1190,7 +1324,7 @@ void wxGDIPlusContext::GetPartialTextExtents(const wxString& text, wxArrayDouble
     wxASSERT_MSG(text.length() == len , wxT("GetPartialTextExtents not yet implemented for multichar situations"));
 
     RectF layoutRect(0,0, 100000.0f, 100000.0f);
     wxASSERT_MSG(text.length() == len , wxT("GetPartialTextExtents not yet implemented for multichar situations"));
 
     RectF layoutRect(0,0, 100000.0f, 100000.0f);

-    StringFormat strFormat;
+    StringFormat strFormat( StringFormat::GenericTypographic() );

 
     CharacterRange* ranges = new CharacterRange[len] ;
     Region* regions = new Region[len];
 
     CharacterRange* ranges = new CharacterRange[len] ;
     Region* regions = new Region[len];


@@ -1200,6 +1334,7 @@ void wxGDIPlusContext::GetPartialTextExtents(const wxString& text, wxArrayDouble
         ranges[i].Length = 1 ;
     }
     strFormat.SetMeasurableCharacterRanges(len,ranges);
         ranges[i].Length = 1 ;
     }
     strFormat.SetMeasurableCharacterRanges(len,ranges);

+    strFormat.SetFormatFlags( StringFormatFlagsMeasureTrailingSpaces | strFormat.GetFormatFlags() ); 

     m_context->MeasureCharacterRanges(ws, -1 , f,layoutRect, &strFormat,1,regions) ;
 
     RectF bbox ;
     m_context->MeasureCharacterRanges(ws, -1 , f,layoutRect, &strFormat,1,regions) ;
 
     RectF bbox ;


@@ -1210,42 +1345,56 @@ void wxGDIPlusContext::GetPartialTextExtents(const wxString& text, wxArrayDouble
     }
 }
 
     }
 }
 

-void* wxGDIPlusContext::GetNativeContext() 
+bool wxGDIPlusContext::ShouldOffset() const
+{     
+    int penwidth = 0 ;
+    if ( !m_pen.IsNull() )
+    {
+        penwidth = (int)((wxGDIPlusPenData*)m_pen.GetRefData())->GetWidth();
+        if ( penwidth == 0 )
+            penwidth = 1;
+    }
+    return ( penwidth % 2 ) == 1;
+}
+
+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
 //-----------------------------------------------------------------------------
 

-class WXDLLIMPEXP_CORE wxGDIPlusRenderer : public wxGraphicsRenderer
+class wxGDIPlusRenderer : public wxGraphicsRenderer

 {
 public :
 {
 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 +1406,25 @@ public :
 
     virtual wxGraphicsContext * CreateContext( const wxWindowDC& dc);
 
 
     virtual wxGraphicsContext * CreateContext( const wxWindowDC& dc);
 

+    virtual wxGraphicsContext * CreateContext( const wxMemoryDC& dc);
+
+    virtual wxGraphicsContext * CreateContext( const wxPrinterDC& 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,24 +1433,32 @@ 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) ;
 
     // sets the font
     virtual wxGraphicsFont CreateFont( const wxFont &font , const wxColour &col = *wxBLACK ) ;
     // 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) ;
 
     // sets the font
     virtual wxGraphicsFont CreateFont( const wxFont &font , const wxColour &col = *wxBLACK ) ;

+
+    // create a native bitmap representation
+    virtual wxGraphicsBitmap CreateBitmap( const wxBitmap &bitmap );
+    
+    // create a subimage from a native image representation
+    virtual wxGraphicsBitmap CreateSubBitmap( const wxGraphicsBitmap &bitmap, wxDouble x, wxDouble y, wxDouble w, wxDouble h  );
+

 protected :
     void EnsureIsLoaded();
     void Load();
     void Unload();
 protected :
     void EnsureIsLoaded();
     void Load();
     void Unload();

+    friend class wxGDIPlusRendererModule;

 
 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)
 } ;


@@ -1332,13 +1495,38 @@ void wxGDIPlusRenderer::Load()
 void wxGDIPlusRenderer::Unload()
 {
     if ( m_gditoken )
 void wxGDIPlusRenderer::Unload()
 {
     if ( m_gditoken )

+    {

         GdiplusShutdown(m_gditoken);
         GdiplusShutdown(m_gditoken);

+        m_gditoken = NULL;
+    }
+    m_loaded = false;

 }
 
 wxGraphicsContext * wxGDIPlusRenderer::CreateContext( const wxWindowDC& dc)
 {
     EnsureIsLoaded();
 }
 
 wxGraphicsContext * wxGDIPlusRenderer::CreateContext( const wxWindowDC& dc)
 {
     EnsureIsLoaded();

-    return new wxGDIPlusContext(this,(HDC) dc.GetHDC());
+    wxMSWDCImpl *msw = wxDynamicCast( dc.GetImpl() , wxMSWDCImpl );
+    return new wxGDIPlusContext(this,(HDC) msw->GetHDC());
+}
+
+wxGraphicsContext * wxGDIPlusRenderer::CreateContext( const wxPrinterDC& dc)
+{
+    EnsureIsLoaded();
+    wxMSWDCImpl *msw = wxDynamicCast( dc.GetImpl() , wxMSWDCImpl );
+    return new wxGDIPlusContext(this,(HDC) msw->GetHDC());
+}
+
+wxGraphicsContext * wxGDIPlusRenderer::CreateContext( const wxMemoryDC& dc)
+{
+    EnsureIsLoaded();
+    wxMSWDCImpl *msw = wxDynamicCast( dc.GetImpl() , wxMSWDCImpl );
+    return new wxGDIPlusContext(this,(HDC) msw->GetHDC());
+}
+
+wxGraphicsContext * wxGDIPlusRenderer::CreateMeasuringContext()
+{
+    EnsureIsLoaded();
+    return new wxGDIPlusMeasuringContext(this);

 }
 
 wxGraphicsContext * wxGDIPlusRenderer::CreateContextFromNativeContext( void * context )
 }
 
 wxGraphicsContext * wxGDIPlusRenderer::CreateContextFromNativeContext( void * context )


@@ -1362,26 +1550,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 +1586,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 +1600,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 +1611,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 +1625,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;


@@ -1446,4 +1638,44 @@ wxGraphicsFont wxGDIPlusRenderer::CreateFont( const wxFont &font , const wxColou
         return wxNullGraphicsFont;
 }
 
         return wxNullGraphicsFont;
 }
 

+wxGraphicsBitmap wxGDIPlusRenderer::CreateBitmap( const wxBitmap &bitmap )
+{
+    EnsureIsLoaded();
+    if ( bitmap.Ok() )
+    {
+        wxGraphicsBitmap p;
+        p.SetRefData(new wxGDIPlusBitmapData( this , bitmap ));
+        return p;
+    }
+    else
+        return wxNullGraphicsBitmap;
+}
+
+wxGraphicsBitmap wxGDIPlusRenderer::CreateSubBitmap( const wxGraphicsBitmap &bitmap, wxDouble x, wxDouble y, wxDouble w, wxDouble h  )
+{
+    EnsureIsLoaded();
+    Bitmap* image = static_cast<wxGDIPlusBitmapData*>(bitmap.GetRefData())->GetGDIPlusBitmap();
+    if ( image )
+    {
+        wxGraphicsBitmap p;
+        p.SetRefData(new wxGDIPlusBitmapData( this , image->Clone( (REAL) x , (REAL) y , (REAL) w , (REAL) h , PixelFormat32bppPARGB) ));
+        return p;
+    }
+    else
+        return wxNullGraphicsBitmap;
+}
+
+// Shutdown GDI+ at app exit, before possible dll unload
+class wxGDIPlusRendererModule : public wxModule
+{
+public:
+    virtual bool OnInit() { return true; }
+    virtual void OnExit() { gs_GDIPlusRenderer.Unload(); }
+
+private:
+    DECLARE_DYNAMIC_CLASS(wxGDIPlusRendererModule)
+};
+
+IMPLEMENT_DYNAMIC_CLASS(wxGDIPlusRendererModule, wxModule)
+

 #endif  // wxUSE_GRAPHICS_CONTEXT
 #endif  // wxUSE_GRAPHICS_CONTEXT