check that the version of __sync_sub_and_fetch that returns a value is supported...

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

diff --git a/src/msw/graphics.cpp b/src/msw/graphics.cpp
index 4e847c1897b3509924084db420de538b5524bec7..94716dde7d7410c158dc9f303b36a497d9f13cd4 100644 (file)
--- a/src/msw/graphics.cpp
+++ b/src/msw/graphics.cpp
@@ -17,29 +17,30 @@
 #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
 
 #include "wx/graphics.h"
 #endif
 
 #include "wx/graphics.h"

+#include "wx/msw/wrapgdip.h"

 
 

-#if wxUSE_GRAPHICS_CONTEXT
+#include "wx/stack.h"

 
 

-#include <vector>
-
-using namespace std;
+WX_DECLARE_STACK(GraphicsState, GraphicsStates);

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


@@ -79,20 +80,7 @@ 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 wxGDIPlusPathData : public wxGraphicsPathData
+class wxGDIPlusPathData : public wxGraphicsPathData

 {
 public :
     wxGDIPlusPathData(wxGraphicsRenderer* renderer, GraphicsPath* path = NULL);
 {
 public :
     wxGDIPlusPathData(wxGraphicsRenderer* renderer, GraphicsPath* path = NULL);


@@ -107,14 +95,14 @@ 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


@@ -127,11 +115,11 @@ public :
     virtual void CloseSubpath();
 
     //
     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 ) ;
     /*
 


@@ -142,11 +130,11 @@ 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)) const {}
+    // 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
     virtual void Transform( const wxGraphicsMatrixData* matrix ) ;
 
     // transforms each point of this path by the matrix
     virtual void Transform( const wxGraphicsMatrixData* matrix ) ;


@@ -160,7 +148,7 @@ private :
     GraphicsPath* m_path;
 };
 
     GraphicsPath* m_path;
 };
 

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

 {
 public :
     wxGDIPlusMatrixData(wxGraphicsRenderer* renderer, Matrix* matrix = NULL) ;
 {
 public :
     wxGDIPlusMatrixData(wxGraphicsRenderer* renderer, Matrix* matrix = NULL) ;


@@ -172,9 +160,13 @@ public :
     virtual void Concat( const wxGraphicsMatrixData *t );
 
     // sets the matrix to the respective values
     virtual void Concat( const wxGraphicsMatrixData *t );
 
     // sets the matrix to the respective values

-    virtual void Set(wxDouble a=1.0, wxDouble b=0.0, wxDouble c=0.0, wxDouble d=1.0, 
+    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();
 
     // makes this the inverse matrix
     virtual void Invert();
 


@@ -195,7 +187,7 @@ 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
 
     //
     // apply the transforms


@@ -213,7 +205,7 @@ private:
     Matrix* m_matrix ;
 } ;
 
     Matrix* m_matrix ;
 } ;
 

-class WXDLLIMPEXP_CORE wxGDIPlusPenData : public wxGraphicsObjectRefData
+class wxGDIPlusPenData : public wxGraphicsObjectRefData

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


@@ -232,14 +224,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 );


@@ -254,7 +246,7 @@ private :
     GraphicsPath* m_brushPath;
 };
 
     GraphicsPath* m_brushPath;
 };
 

-class WXDLLIMPEXP_CORE wxGDIPlusFontData : public wxGraphicsObjectRefData
+class wxGDIPlusFontData : public wxGraphicsObjectRefData

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


@@ -267,7 +259,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 );


@@ -280,18 +272,24 @@ 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();
-       
+    // 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 = wxODDEVEN_RULE );
 
     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 );    
+       // 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
     virtual void ConcatTransform( const wxGraphicsMatrix& matrix );
 
     // concatenates this transform with the current transform of this context
     virtual void ConcatTransform( const wxGraphicsMatrix& matrix );


@@ -304,26 +302,47 @@ public:
 
     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
 //-----------------------------------------------------------------------------


@@ -344,7 +363,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)


@@ -479,7 +498,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);
 }


@@ -531,7 +550,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() )


@@ -557,7 +576,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() ),


@@ -585,7 +604,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;


@@ -672,10 +691,10 @@ void wxGDIPlusPathData::GetCurrentPoint( wxDouble* x, wxDouble* y) const
     *y = start.Y ;
 }
 
     *y = start.Y ;
 }
 

-void wxGDIPlusPathData::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;
     }


@@ -693,7 +712,7 @@ void wxGDIPlusPathData::AddArc( wxDouble x, wxDouble y, wxDouble r, double start
 
         }
    }
 
         }
    }

-   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 wxGDIPlusPathData::AddRectangle( wxDouble x, wxDouble y, wxDouble w, wxDouble h )
 }
 
 void wxGDIPlusPathData::AddRectangle( wxDouble x, wxDouble y, wxDouble w, wxDouble h )


@@ -708,7 +727,7 @@ void wxGDIPlusPathData::AddPath( const wxGraphicsPathData* path )
 
 
 // transforms each point of this path by the matrix
 
 
 // transforms each point of this path by the matrix

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

 {
     m_path->Transform( (Matrix*) matrix->GetNativeMatrix() );
 }
 {
     m_path->Transform( (Matrix*) matrix->GetNativeMatrix() );
 }


@@ -743,12 +762,12 @@ wxGDIPlusMatrixData::wxGDIPlusMatrixData(wxGraphicsRenderer* renderer, Matrix* m
         m_matrix = new Matrix();
 }
 
         m_matrix = new Matrix();
 }
 

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

 {
     delete m_matrix;
 }
 
 {
     delete m_matrix;
 }
 

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

 {
     return new wxGDIPlusMatrixData( GetRenderer(), m_matrix->Clone());
 }
 {
     return new wxGDIPlusMatrixData( GetRenderer(), m_matrix->Clone());
 }


@@ -760,12 +779,26 @@ void wxGDIPlusMatrixData::Concat( const wxGraphicsMatrixData *t )
 }
 
 // sets the matrix to the respective values
 }
 
 // sets the matrix to the respective values

-void wxGDIPlusMatrixData::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
 void wxGDIPlusMatrixData::Invert()
 {
 // makes this the inverse matrix
 void wxGDIPlusMatrixData::Invert()
 {


@@ -773,7 +806,7 @@ void wxGDIPlusMatrixData::Invert()
 }
 
 // returns true if the elements of the transformation matrix are equal ?
 }
 
 // returns true if the elements of the transformation matrix are equal ?

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

 {
     return m_matrix->Equals((Matrix*) t->GetNativeMatrix())== TRUE ;
 }
 {
     return m_matrix->Equals((Matrix*) t->GetNativeMatrix())== TRUE ;
 }


@@ -839,8 +872,29 @@ void * wxGDIPlusMatrixData::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();


@@ -878,6 +932,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();


@@ -896,23 +952,59 @@ 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::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() )
     {
 void wxGDIPlusContext::StrokePath( const wxGraphicsPath& path )
 {
     if ( !m_pen.IsNull() )
     {

+        wxGDIPlusOffsetHelper helper( m_context , ShouldOffset() );

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


@@ -921,18 +1013,19 @@ void wxGDIPlusContext::FillPath( const wxGraphicsPath& path , int fillStyle )
 {
     if ( !m_brush.IsNull() )
     {
 {
     if ( !m_brush.IsNull() )
     {

+        wxGDIPlusOffsetHelper helper( m_context , ShouldOffset() );

         ((GraphicsPath*) path.GetNativePath())->SetFillMode( fillStyle == wxODDEVEN_RULE ? FillModeAlternate : FillModeWinding);
         ((GraphicsPath*) path.GetNativePath())->SetFillMode( fillStyle == wxODDEVEN_RULE ? FillModeAlternate : FillModeWinding);

-        m_context->FillPath( ((wxGDIPlusBrushData*)m_brush.GetRefData())->GetGDIPlusBrush() , 
+        m_context->FillPath( ((wxGDIPlusBrushData*)m_brush.GetRefData())->GetGDIPlusBrush() ,

             (GraphicsPath*) path.GetNativePath());
     }
 }
 
             (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 );
 }


@@ -945,26 +1038,26 @@ 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 
+// 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();


@@ -977,7 +1070,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);
 
 


@@ -1021,8 +1114,8 @@ void wxGDIPlusContext::DrawBitmap( const wxBitmap &bmp, wxDouble x, wxDouble y,
     }
     else
     {
     }
     else
     {

-        image = Bitmap::FromHBITMAP((HBITMAP)bmp.GetHBITMAP(),(HPALETTE)bmp.GetPalette()->GetHPALETTE());        
-        if ( GetPixelFormatSize(image->GetPixelFormat()) == 32 )
+        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();
         {
             size_t width = image->GetWidth();
             size_t height = image->GetHeight();


@@ -1034,8 +1127,8 @@ 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, 
-                PixelFormat32bppARGB , (BYTE*) data.Scan0);
+            image = new Bitmap(data.Width, data.Height, data.Stride,
+                PixelFormat32bppPARGB , (BYTE*) data.Scan0);

 
             helper->UnlockBits(&data);
         }
 
             helper->UnlockBits(&data);
         }


@@ -1046,20 +1139,22 @@ 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 )

 {
 {

+    // 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);


@@ -1073,8 +1168,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);
     }
 


@@ -1085,15 +1200,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,


@@ -1102,7 +1216,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 ;


@@ -1115,35 +1229,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());


@@ -1157,7 +1267,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];


@@ -1167,6 +1277,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 ;


@@ -1177,9 +1288,21 @@ 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


@@ -1205,16 +1328,16 @@ wxGraphicsMatrix wxGDIPlusContext::GetTransform() const
 // 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)
         {


@@ -1226,19 +1349,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
 
     virtual wxGraphicsPath CreatePath();
 
     // Matrix
 
     // Path
 
     virtual wxGraphicsPath CreatePath();
 
     // Matrix
 

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

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


@@ -1247,10 +1374,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) ;


@@ -1261,10 +1388,11 @@ protected :
     void EnsureIsLoaded();
     void Load();
     void Unload();
     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)
 } ;


@@ -1301,13 +1429,31 @@ 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 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 )


@@ -1342,7 +1488,7 @@ wxGraphicsPath wxGDIPlusRenderer::CreatePath()
 
 // 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)
 
 {
                                                            wxDouble tx, wxDouble ty)
 
 {


@@ -1354,7 +1500,7 @@ wxGraphicsMatrix wxGDIPlusRenderer::CreateMatrix( wxDouble a, wxDouble b, wxDoub
     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 )


@@ -1367,7 +1513,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 )


@@ -1381,8 +1527,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;


@@ -1392,10 +1538,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;


@@ -1406,11 +1552,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;


@@ -1419,4 +1565,17 @@ wxGraphicsFont wxGDIPlusRenderer::CreateFont( const wxFont &font , const wxColou
         return wxNullGraphicsFont;
 }
 
         return wxNullGraphicsFont;
 }
 

+// 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