Use the same logic for closing dialogs as for handling Escape key.

[wxWidgets.git] / src / common / graphcmn.cpp

diff --git a/src/common/graphcmn.cpp b/src/common/graphcmn.cpp
index 4fbab9c909c80f4f6efb607b5c551c9e4f8093f9..0c24351e7e2b049f43a8a2b4e4cf476739fd64f1 100644 (file)
--- a/src/common/graphcmn.cpp
+++ b/src/common/graphcmn.cpp
@@ -3,7 +3,7 @@
 // Purpose:     graphics context methods common to all platforms
 // Author:      Stefan Csomor
 // Modified by:
 // Purpose:     graphics context methods common to all platforms
 // Author:      Stefan Csomor
 // Modified by:

-// Created:     
+// Created:

 // RCS-ID:      $Id$
 // Copyright:   (c) Stefan Csomor
 // Licence:     wxWindows licence
 // RCS-ID:      $Id$
 // Copyright:   (c) Stefan Csomor
 // Licence:     wxWindows licence


@@ -28,11 +28,7 @@
     #include "wx/log.h"
 #endif
 
     #include "wx/log.h"
 #endif
 

-//-----------------------------------------------------------------------------
-// constants
-//-----------------------------------------------------------------------------
-
-static const double RAD2DEG = 180.0 / M_PI;
+#include "wx/private/graphics.h"

 
 //-----------------------------------------------------------------------------
 // Local functions
 
 //-----------------------------------------------------------------------------
 // Local functions


@@ -59,42 +55,42 @@ wxGraphicsObjectRefData::wxGraphicsObjectRefData( const wxGraphicsObjectRefData*
 {
     m_renderer = data->m_renderer;
 }
 {
     m_renderer = data->m_renderer;
 }

-wxGraphicsRenderer* wxGraphicsObjectRefData::GetRenderer() const 
-{ 
-    return m_renderer ; 
+wxGraphicsRenderer* wxGraphicsObjectRefData::GetRenderer() const
+{
+    return m_renderer ;

 }
 
 }
 

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

 {
     return new wxGraphicsObjectRefData(this);
 }
 
 {
     return new wxGraphicsObjectRefData(this);
 }
 

-wxGraphicsObject::wxGraphicsObject() 
+wxGraphicsObject::wxGraphicsObject()

 {
 }
 
 {
 }
 

-wxGraphicsObject::wxGraphicsObject( wxGraphicsRenderer* renderer ) 
+wxGraphicsObject::wxGraphicsObject( wxGraphicsRenderer* renderer )

 {
     SetRefData( new wxGraphicsObjectRefData(renderer));
 }
 
 {
     SetRefData( new wxGraphicsObjectRefData(renderer));
 }
 

-wxGraphicsObject::~wxGraphicsObject() 
+wxGraphicsObject::~wxGraphicsObject()

 {
 }
 
 {
 }
 

-bool wxGraphicsObject::IsNull() const 
-{ 
-    return m_refData == NULL; 
+bool wxGraphicsObject::IsNull() const
+{
+    return m_refData == NULL;

 }
 
 }
 

-wxGraphicsRenderer* wxGraphicsObject::GetRenderer() const 
-{ 
-    return ( IsNull() ? NULL : GetGraphicsData()->GetRenderer() ); 
+wxGraphicsRenderer* wxGraphicsObject::GetRenderer() const
+{
+    return ( IsNull() ? NULL : GetGraphicsData()->GetRenderer() );

 }
 
 }
 

-wxGraphicsObjectRefData* wxGraphicsObject::GetGraphicsData() const 
-{ 
-    return (wxGraphicsObjectRefData*) m_refData; 
+wxGraphicsObjectRefData* wxGraphicsObject::GetGraphicsData() const
+{
+    return (wxGraphicsObjectRefData*) m_refData;

 }
 
 wxObjectRefData* wxGraphicsObject::CreateRefData() const
 }
 
 wxObjectRefData* wxGraphicsObject::CreateRefData() const


@@ -116,10 +112,12 @@ wxObjectRefData* wxGraphicsObject::CloneRefData(const wxObjectRefData* data) con
 IMPLEMENT_DYNAMIC_CLASS(wxGraphicsPen, wxGraphicsObject)
 IMPLEMENT_DYNAMIC_CLASS(wxGraphicsBrush, wxGraphicsObject)
 IMPLEMENT_DYNAMIC_CLASS(wxGraphicsFont, wxGraphicsObject)
 IMPLEMENT_DYNAMIC_CLASS(wxGraphicsPen, wxGraphicsObject)
 IMPLEMENT_DYNAMIC_CLASS(wxGraphicsBrush, wxGraphicsObject)
 IMPLEMENT_DYNAMIC_CLASS(wxGraphicsFont, wxGraphicsObject)

+IMPLEMENT_DYNAMIC_CLASS(wxGraphicsBitmap, wxGraphicsObject)

 
 WXDLLIMPEXP_DATA_CORE(wxGraphicsPen) wxNullGraphicsPen;
 WXDLLIMPEXP_DATA_CORE(wxGraphicsBrush) wxNullGraphicsBrush;
 WXDLLIMPEXP_DATA_CORE(wxGraphicsFont) wxNullGraphicsFont;
 
 WXDLLIMPEXP_DATA_CORE(wxGraphicsPen) wxNullGraphicsPen;
 WXDLLIMPEXP_DATA_CORE(wxGraphicsBrush) wxNullGraphicsBrush;
 WXDLLIMPEXP_DATA_CORE(wxGraphicsFont) wxNullGraphicsFont;

+WXDLLIMPEXP_DATA_CORE(wxGraphicsBitmap) wxNullGraphicsBitmap;

 
 //-----------------------------------------------------------------------------
 // matrix
 
 //-----------------------------------------------------------------------------
 // matrix


@@ -136,7 +134,7 @@ void wxGraphicsMatrix::Concat( const wxGraphicsMatrix *t )
 }
 
 // sets the matrix to the respective values
 }
 
 // sets the matrix to the respective values

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

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


@@ -188,7 +186,7 @@ void wxGraphicsMatrix::Rotate( wxDouble angle )
 {
     AllocExclusive();
     GetMatrixData()->Rotate(angle);
 {
     AllocExclusive();
     GetMatrixData()->Rotate(angle);

-}  
+}

 
 //
 // apply the transforms
 
 //
 // apply the transforms


@@ -250,12 +248,12 @@ void wxGraphicsPath::AddArc( const wxPoint2DDouble& c, wxDouble r, wxDouble star
 
 wxRect2DDouble wxGraphicsPath::GetBox() const
 {
 
 wxRect2DDouble wxGraphicsPath::GetBox() const
 {

-       wxDouble x,y,w,h;
-       GetBox(&x,&y,&w,&h);
-       return wxRect2DDouble( x,y,w,h );
+    wxDouble x,y,w,h;
+    GetBox(&x,&y,&w,&h);
+    return wxRect2DDouble( x,y,w,h );

 }
 
 }
 

-bool wxGraphicsPath::Contains( const wxPoint2DDouble& c, int fillStyle ) const
+bool wxGraphicsPath::Contains( const wxPoint2DDouble& c, wxPolygonFillMode fillStyle ) const

 {
     return Contains( c.m_x, c.m_y, fillStyle);
 }
 {
     return Contains( c.m_x, c.m_y, fillStyle);
 }


@@ -269,7 +267,7 @@ void wxGraphicsPath::MoveToPoint( wxDouble x, wxDouble y )
     GetPathData()->MoveToPoint(x,y);
 }
 
     GetPathData()->MoveToPoint(x,y);
 }
 

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

 void wxGraphicsPath::AddLineToPoint( wxDouble x, wxDouble y )
 {
     AllocExclusive();
 void wxGraphicsPath::AddLineToPoint( wxDouble x, wxDouble y )
 {
     AllocExclusive();


@@ -311,7 +309,7 @@ void wxGraphicsPath::AddArc( wxDouble x, wxDouble y, wxDouble r, wxDouble startA
 }
 
 //
 }
 
 //

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


@@ -322,7 +320,7 @@ void wxGraphicsPath::AddQuadCurveToPoint( wxDouble cx, wxDouble cy, wxDouble x,
     GetPathData()->AddQuadCurveToPoint(cx,cy,x,y);
 }
 
     GetPathData()->AddQuadCurveToPoint(cx,cy,x,y);
 }
 

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

 void wxGraphicsPath::AddRectangle( wxDouble x, wxDouble y, wxDouble w, wxDouble h )
 {
     AllocExclusive();
 void wxGraphicsPath::AddRectangle( wxDouble x, wxDouble y, wxDouble w, wxDouble h )
 {
     AllocExclusive();


@@ -337,7 +335,7 @@ void wxGraphicsPath::AddCircle( wxDouble x, wxDouble y, wxDouble r )
 }
 
 // appends a an arc to two tangents connecting (current) to (x1,y1) and (x1,y1) to (x2,y2), also a straight line from (current) to (x1,y1)
 }
 
 // appends a an arc to two tangents connecting (current) to (x1,y1) and (x1,y1) to (x2,y2), also a straight line from (current) to (x1,y1)

-void wxGraphicsPath::AddArcToPoint( wxDouble x1, wxDouble y1 , wxDouble x2, wxDouble y2, wxDouble r ) 
+void wxGraphicsPath::AddArcToPoint( wxDouble x1, wxDouble y1 , wxDouble x2, wxDouble y2, wxDouble r )

 {
     GetPathData()->AddArcToPoint(x1,y1,x2,y2,r);
 }
 {
     GetPathData()->AddArcToPoint(x1,y1,x2,y2,r);
 }


@@ -381,7 +379,7 @@ void wxGraphicsPath::GetBox(wxDouble *x, wxDouble *y, wxDouble *w, wxDouble *h)
     GetPathData()->GetBox(x,y,w,h);
 }
 
     GetPathData()->GetBox(x,y,w,h);
 }
 

-bool wxGraphicsPath::Contains( wxDouble x, wxDouble y, int fillStyle ) const
+bool wxGraphicsPath::Contains( wxDouble x, wxDouble y, wxPolygonFillMode fillStyle ) const

 {
     return GetPathData()->Contains(x,y,fillStyle);
 }
 {
     return GetPathData()->Contains(x,y,fillStyle);
 }


@@ -423,6 +421,9 @@ void wxGraphicsPathData::AddCircle( wxDouble x, wxDouble y, wxDouble r )
 
 void wxGraphicsPathData::AddEllipse( wxDouble x, wxDouble y, wxDouble w, wxDouble h)
 {
 
 void wxGraphicsPathData::AddEllipse( wxDouble x, wxDouble y, wxDouble w, wxDouble h)
 {

+    if (w <= 0. || h <= 0.)
+      return;
+

     wxDouble rw = w/2;
     wxDouble rh = h/2;
     wxDouble xc = x + rw;
     wxDouble rw = w/2;
     wxDouble rh = h/2;
     wxDouble xc = x + rw;


@@ -453,7 +454,7 @@ void wxGraphicsPathData::AddRoundedRectangle( wxDouble x, wxDouble y, wxDouble w
 
 // draws a an arc to two tangents connecting (current) to (x1,y1) and (x1,y1) to (x2,y2), also a straight line from (current) to (x1,y1)
 void wxGraphicsPathData::AddArcToPoint( wxDouble x1, wxDouble y1 , wxDouble x2, wxDouble y2, wxDouble r )
 
 // draws a an arc to two tangents connecting (current) to (x1,y1) and (x1,y1) to (x2,y2), also a straight line from (current) to (x1,y1)
 void wxGraphicsPathData::AddArcToPoint( wxDouble x1, wxDouble y1 , wxDouble x2, wxDouble y2, wxDouble r )

-{   
+{

     wxPoint2DDouble current;
     GetCurrentPoint(&current.m_x,&current.m_y);
     wxPoint2DDouble p1(x1,y1);
     wxPoint2DDouble current;
     GetCurrentPoint(&current.m_x,&current.m_y);
     wxPoint2DDouble p1(x1,y1);


@@ -475,7 +476,6 @@ void wxGraphicsPathData::AddArcToPoint( wxDouble x1, wxDouble y1 , wxDouble x2,
     wxDouble dist = r / sin(alpha/2) * cos(alpha/2);
     // calculate tangential points
     wxPoint2DDouble t1 = dist*v1 + p1;
     wxDouble dist = r / sin(alpha/2) * cos(alpha/2);
     // calculate tangential points
     wxPoint2DDouble t1 = dist*v1 + p1;

-    wxPoint2DDouble t2 = dist*v2 + p1;

 
     wxPoint2DDouble nv1 = v1;
     nv1.SetVectorAngle(v1.GetVectorAngle()-90);
 
     wxPoint2DDouble nv1 = v1;
     nv1.SetVectorAngle(v1.GetVectorAngle()-90);


@@ -489,6 +489,41 @@ void wxGraphicsPathData::AddArcToPoint( wxDouble x1, wxDouble y1 , wxDouble x2,
     AddLineToPoint(p2.m_x,p2.m_y);
 }
 
     AddLineToPoint(p2.m_x,p2.m_y);
 }
 

+//-----------------------------------------------------------------------------
+// wxGraphicsGradientStops
+//-----------------------------------------------------------------------------
+
+void wxGraphicsGradientStops::Add(const wxGraphicsGradientStop& stop)
+{
+    for ( wxVector<wxGraphicsGradientStop>::iterator it = m_stops.begin();
+          it != m_stops.end();
+          ++it )
+    {
+        if ( stop.GetPosition() < it->GetPosition() )
+        {
+            if ( it != m_stops.begin() )
+            {
+                m_stops.insert(it, stop);
+            }
+            else // we shouldn't be inserting it at the beginning
+            {
+                wxFAIL_MSG( "invalid gradient stop position < 0" );
+            }
+
+            return;
+        }
+    }
+
+    if ( stop.GetPosition() == 1. )
+    {
+        m_stops.insert(m_stops.end() - 1, stop);
+    }
+    else
+    {
+        wxFAIL_MSG( "invalid gradient stop position > 1" );
+    }
+}
+

 //-----------------------------------------------------------------------------
 // wxGraphicsContext Convenience Methods
 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------
 // wxGraphicsContext Convenience Methods
 //-----------------------------------------------------------------------------


@@ -496,20 +531,22 @@ void wxGraphicsPathData::AddArcToPoint( wxDouble x1, wxDouble y1 , wxDouble x2,
 IMPLEMENT_ABSTRACT_CLASS(wxGraphicsContext, wxObject)
 
 
 IMPLEMENT_ABSTRACT_CLASS(wxGraphicsContext, wxObject)
 
 

-wxGraphicsContext::wxGraphicsContext(wxGraphicsRenderer* renderer) : wxGraphicsObject(renderer) 
+wxGraphicsContext::wxGraphicsContext(wxGraphicsRenderer* renderer) :
+    wxGraphicsObject(renderer),
+      m_antialias(wxANTIALIAS_DEFAULT),
+      m_composition(wxCOMPOSITION_OVER)

 {
 {

-    m_logicalFunction = wxCOPY;

 }
 
 }
 

-wxGraphicsContext::~wxGraphicsContext() 
+wxGraphicsContext::~wxGraphicsContext()

 {
 }
 
 {
 }
 

-bool wxGraphicsContext::StartDoc(const wxString& WXUNUSED(message)) 
+bool wxGraphicsContext::StartDoc(const wxString& WXUNUSED(message))

 {
     return true;
 }
 {
     return true;
 }

-    
+

 void wxGraphicsContext::EndDoc()
 {
 }
 void wxGraphicsContext::EndDoc()
 {
 }


@@ -518,7 +555,7 @@ void wxGraphicsContext::StartPage(wxDouble WXUNUSED(width),
                                   wxDouble WXUNUSED(height))
 {
 }
                                   wxDouble WXUNUSED(height))
 {
 }

-    
+

 void wxGraphicsContext::EndPage()
 {
 }
 void wxGraphicsContext::EndPage()
 {
 }


@@ -531,7 +568,7 @@ void wxGraphicsContext::Flush()
 void wxGraphicsContext::SetAlpha( wxDouble WXUNUSED(alpha) )
 {
 }
 void wxGraphicsContext::SetAlpha( wxDouble WXUNUSED(alpha) )
 {
 }

-    
+

 wxDouble wxGraphicsContext::GetAlpha() const
 {
     return 1.0;
 wxDouble wxGraphicsContext::GetAlpha() const
 {
     return 1.0;


@@ -551,49 +588,39 @@ void wxGraphicsContext::GetDPI( wxDouble* dpiX, wxDouble* dpiY)
 }
 
 // sets the pen
 }
 
 // sets the pen

-void wxGraphicsContext::SetPen( const wxGraphicsPen& pen ) 
+void wxGraphicsContext::SetPen( const wxGraphicsPen& pen )

 {
     m_pen = pen;
 }
 
 void wxGraphicsContext::SetPen( const wxPen& pen )
 {
 {
     m_pen = pen;
 }
 
 void wxGraphicsContext::SetPen( const wxPen& pen )
 {

-    if ( !pen.Ok() || pen.GetStyle() == wxTRANSPARENT )
+    if ( !pen.Ok() || pen.GetStyle() == wxPENSTYLE_TRANSPARENT )

         SetPen( wxNullGraphicsPen );
     else
         SetPen( CreatePen( pen ) );
 }
         SetPen( wxNullGraphicsPen );
     else
         SetPen( CreatePen( pen ) );
 }

-    
+

 // sets the brush for filling
 // sets the brush for filling

-void wxGraphicsContext::SetBrush( const wxGraphicsBrush& brush ) 
+void wxGraphicsContext::SetBrush( const wxGraphicsBrush& brush )

 {
     m_brush = brush;
 }
 
 void wxGraphicsContext::SetBrush( const wxBrush& brush )
 {
 {
     m_brush = brush;
 }
 
 void wxGraphicsContext::SetBrush( const wxBrush& brush )
 {

-    if ( !brush.Ok() || brush.GetStyle() == wxTRANSPARENT )
+    if ( !brush.Ok() || brush.GetStyle() == wxBRUSHSTYLE_TRANSPARENT )

         SetBrush( wxNullGraphicsBrush );
     else
         SetBrush( CreateBrush( brush ) );
 }
 
 // sets the brush for filling
         SetBrush( wxNullGraphicsBrush );
     else
         SetBrush( CreateBrush( brush ) );
 }
 
 // sets the brush for filling

-void wxGraphicsContext::SetFont( const wxGraphicsFont& font ) 
+void wxGraphicsContext::SetFont( const wxGraphicsFont& font )

 {
     m_font = font;
 }
 
 {
     m_font = font;
 }
 

-bool wxGraphicsContext::SetLogicalFunction( int function )
-{
-    if ( function == wxCOPY )
-    {
-        m_logicalFunction = function;
-        return true;
-    }
-    return false;
-}
-

 void wxGraphicsContext::SetFont( const wxFont& font, const wxColour& colour )
 {
     if ( font.Ok() )
 void wxGraphicsContext::SetFont( const wxFont& font, const wxColour& colour )
 {
     if ( font.Ok() )


@@ -602,13 +629,17 @@ void wxGraphicsContext::SetFont( const wxFont& font, const wxColour& colour )
         SetFont( wxNullGraphicsFont );
 }
 
         SetFont( wxNullGraphicsFont );
 }
 

-void wxGraphicsContext::DrawPath( const wxGraphicsPath& path, int fillStyle )
+void wxGraphicsContext::DrawPath( const wxGraphicsPath& path, wxPolygonFillMode fillStyle )

 {
     FillPath( path , fillStyle );
     StrokePath( path );
 }
 
 {
     FillPath( path , fillStyle );
     StrokePath( path );
 }
 

-void wxGraphicsContext::DrawText( const wxString &str, wxDouble x, wxDouble y, wxDouble angle )
+void
+wxGraphicsContext::DoDrawRotatedText(const wxString &str,
+                                     wxDouble x,
+                                     wxDouble y,
+                                     wxDouble angle)

 {
     Translate(x,y);
     Rotate( -angle );
 {
     Translate(x,y);
     Rotate( -angle );


@@ -617,18 +648,22 @@ void wxGraphicsContext::DrawText( const wxString &str, wxDouble x, wxDouble y, w
     Translate(-x,-y);
 }
 
     Translate(-x,-y);
 }
 

-void wxGraphicsContext::DrawText( const wxString &str, wxDouble x, wxDouble y, const wxGraphicsBrush& backgroundBrush ) 
+void
+wxGraphicsContext::DoDrawFilledText(const wxString &str,
+                                    wxDouble x,
+                                    wxDouble y,
+                                    const wxGraphicsBrush& backgroundBrush)

 {
     wxGraphicsBrush formerBrush = m_brush;
 {
     wxGraphicsBrush formerBrush = m_brush;

-       wxGraphicsPen formerPen = m_pen;
+    wxGraphicsPen formerPen = m_pen;

     wxDouble width;
     wxDouble height;
     wxDouble descent;
     wxDouble externalLeading;
     GetTextExtent( str , &width, &height, &descent, &externalLeading );
     SetBrush( backgroundBrush );
     wxDouble width;
     wxDouble height;
     wxDouble descent;
     wxDouble externalLeading;
     GetTextExtent( str , &width, &height, &descent, &externalLeading );
     SetBrush( backgroundBrush );

-       // to make sure our 'OffsetToPixelBoundaries' doesn't move the fill shape
-       SetPen( wxNullGraphicsPen );
+    // to make sure our 'OffsetToPixelBoundaries' doesn't move the fill shape
+    SetPen( wxNullGraphicsPen );

 
     wxGraphicsPath path = CreatePath();
     path.AddRectangle( x , y, width, height );
 
     wxGraphicsPath path = CreatePath();
     path.AddRectangle( x , y, width, height );


@@ -636,13 +671,17 @@ void wxGraphicsContext::DrawText( const wxString &str, wxDouble x, wxDouble y, c
 
     DrawText( str, x ,y);
     SetBrush( formerBrush );
 
     DrawText( str, x ,y);
     SetBrush( formerBrush );

-       SetPen( formerPen );
+    SetPen( formerPen );

 }
 
 }
 

-void wxGraphicsContext::DrawText( const wxString &str, wxDouble x, wxDouble y, wxDouble angle, const wxGraphicsBrush& backgroundBrush )
+void
+wxGraphicsContext::DoDrawRotatedFilledText(const wxString &str,
+                                           wxDouble x, wxDouble y,
+                                           wxDouble angle,
+                                           const wxGraphicsBrush& backgroundBrush)

 {
     wxGraphicsBrush formerBrush = m_brush;
 {
     wxGraphicsBrush formerBrush = m_brush;

-       wxGraphicsPen formerPen = m_pen;
+    wxGraphicsPen formerPen = m_pen;

 
     wxDouble width;
     wxDouble height;
 
     wxDouble width;
     wxDouble height;


@@ -650,8 +689,8 @@ void wxGraphicsContext::DrawText( const wxString &str, wxDouble x, wxDouble y, w
     wxDouble externalLeading;
     GetTextExtent( str , &width, &height, &descent, &externalLeading );
     SetBrush( backgroundBrush );
     wxDouble externalLeading;
     GetTextExtent( str , &width, &height, &descent, &externalLeading );
     SetBrush( backgroundBrush );

-       // to make sure our 'OffsetToPixelBoundaries' doesn't move the fill shape
-       SetPen( wxNullGraphicsPen );
+    // to make sure our 'OffsetToPixelBoundaries' doesn't move the fill shape
+    SetPen( wxNullGraphicsPen );

 
     wxGraphicsPath path = CreatePath();
     path.MoveToPoint( x , y );
 
     wxGraphicsPath path = CreatePath();
     path.MoveToPoint( x , y );


@@ -663,7 +702,7 @@ void wxGraphicsContext::DrawText( const wxString &str, wxDouble x, wxDouble y, w
     FillPath( path );
     DrawText( str, x ,y, angle);
     SetBrush( formerBrush );
     FillPath( path );
     DrawText( str, x ,y, angle);
     SetBrush( formerBrush );

-       SetPen( formerPen );
+    SetPen( formerPen );

 }
 
 void wxGraphicsContext::StrokeLine( wxDouble x1, wxDouble y1, wxDouble x2, wxDouble y2)
 }
 
 void wxGraphicsContext::StrokeLine( wxDouble x1, wxDouble y1, wxDouble x2, wxDouble y2)


@@ -705,7 +744,7 @@ void wxGraphicsContext::StrokeLines( size_t n, const wxPoint2DDouble *points)
     StrokePath( path );
 }
 
     StrokePath( path );
 }
 

-void wxGraphicsContext::DrawLines( size_t n, const wxPoint2DDouble *points, int fillStyle)
+void wxGraphicsContext::DrawLines( size_t n, const wxPoint2DDouble *points, wxPolygonFillMode fillStyle)

 {
     wxASSERT(n > 1);
     wxGraphicsPath path = CreatePath();
 {
     wxASSERT(n > 1);
     wxGraphicsPath path = CreatePath();


@@ -728,7 +767,7 @@ void wxGraphicsContext::StrokeLines( size_t n, const wxPoint2DDouble *beginPoint
 }
 
 // create a 'native' matrix corresponding to these values
 }
 
 // create a 'native' matrix corresponding to these values

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

     wxDouble tx, wxDouble ty) const
 {
     return GetRenderer()->CreateMatrix(a,b,c,d,tx,ty);
     wxDouble tx, wxDouble ty) const
 {
     return GetRenderer()->CreateMatrix(a,b,c,d,tx,ty);


@@ -749,19 +788,55 @@ wxGraphicsBrush wxGraphicsContext::CreateBrush(const wxBrush& brush ) const
     return GetRenderer()->CreateBrush(brush);
 }
 
     return GetRenderer()->CreateBrush(brush);
 }
 

-// sets the brush to a linear gradient, starting at (x1,y1) with color c1 to (x2,y2) with color c2
-wxGraphicsBrush wxGraphicsContext::CreateLinearGradientBrush( wxDouble x1, wxDouble y1, wxDouble x2, wxDouble y2, 
-                                                   const wxColour&c1, const wxColour&c2) const
+wxGraphicsBrush
+wxGraphicsContext::CreateLinearGradientBrush(
+    wxDouble x1, wxDouble y1,
+    wxDouble x2, wxDouble y2,
+    const wxColour& c1, const wxColour& c2) const
+{
+    return GetRenderer()->CreateLinearGradientBrush
+                          (
+                            x1, y1,
+                            x2, y2,
+                            wxGraphicsGradientStops(c1,c2)
+                          );
+}
+
+wxGraphicsBrush
+wxGraphicsContext::CreateLinearGradientBrush(
+    wxDouble x1, wxDouble y1,
+    wxDouble x2, wxDouble y2,
+    const wxGraphicsGradientStops& gradientStops) const
+{
+    return GetRenderer()->CreateLinearGradientBrush(x1,y1,x2,y2, gradientStops);
+}
+
+wxGraphicsBrush
+wxGraphicsContext::CreateRadialGradientBrush(
+        wxDouble xo, wxDouble yo,
+        wxDouble xc, wxDouble yc, wxDouble radius,
+        const wxColour &oColor, const wxColour &cColor) const

 {
 {

-    return GetRenderer()->CreateLinearGradientBrush(x1,y1,x2,y2,c1,c2);
+    return GetRenderer()->CreateRadialGradientBrush
+                          (
+                            xo, yo,
+                            xc, yc, radius,
+                            wxGraphicsGradientStops(oColor, cColor)
+                          );

 }
 
 }
 

-// 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 wxGraphicsContext::CreateRadialGradientBrush( wxDouble xo, wxDouble yo, wxDouble xc, wxDouble yc, wxDouble radius,
-                                                   const wxColour &oColor, const wxColour &cColor) const
+wxGraphicsBrush
+wxGraphicsContext::CreateRadialGradientBrush(
+        wxDouble xo, wxDouble yo,
+        wxDouble xc, wxDouble yc, wxDouble radius,
+        const wxGraphicsGradientStops& gradientStops) const

 {
 {

-    return GetRenderer()->CreateRadialGradientBrush(xo,yo,xc,yc,radius,oColor,cColor);
+    return GetRenderer()->CreateRadialGradientBrush
+                          (
+                            xo, yo,
+                            xc, yc, radius,
+                            gradientStops
+                          );

 }
 
 // sets the font
 }
 
 // sets the font


@@ -770,16 +845,41 @@ wxGraphicsFont wxGraphicsContext::CreateFont( const wxFont &font , const wxColou
     return GetRenderer()->CreateFont(font,col);
 }
 
     return GetRenderer()->CreateFont(font,col);
 }
 

-wxGraphicsContext* wxGraphicsContext::Create( const wxWindowDC& dc) 
+wxGraphicsBitmap wxGraphicsContext::CreateBitmap( const wxBitmap& bmp ) const
+{
+    return GetRenderer()->CreateBitmap(bmp);
+}
+
+wxGraphicsBitmap wxGraphicsContext::CreateSubBitmap( const wxGraphicsBitmap &bmp, wxDouble x, wxDouble y, wxDouble w, wxDouble h   ) const
+{
+    return GetRenderer()->CreateSubBitmap(bmp,x,y,w,h);
+}
+
+/* static */ wxGraphicsContext* wxGraphicsContext::Create( const wxWindowDC& dc)
+{
+    return wxGraphicsRenderer::GetDefaultRenderer()->CreateContext(dc);
+}
+
+/* static */ wxGraphicsContext* wxGraphicsContext::Create( const wxMemoryDC& dc)

 {
     return wxGraphicsRenderer::GetDefaultRenderer()->CreateContext(dc);
 }
 
 {
     return wxGraphicsRenderer::GetDefaultRenderer()->CreateContext(dc);
 }
 

-wxGraphicsContext* wxGraphicsContext::Create( const wxMemoryDC& dc) 
+#if wxUSE_PRINTING_ARCHITECTURE
+/* static */ wxGraphicsContext* wxGraphicsContext::Create( const wxPrinterDC& dc)

 {
     return wxGraphicsRenderer::GetDefaultRenderer()->CreateContext(dc);
 }
 
 {
     return wxGraphicsRenderer::GetDefaultRenderer()->CreateContext(dc);
 }
 

+#ifdef __WXMSW__
+/* static */ wxGraphicsContext* wxGraphicsContext::Create( const wxEnhMetaFileDC& dc)
+{
+    return wxGraphicsRenderer::GetDefaultRenderer()->CreateContext(dc);
+}
+#endif
+
+#endif // wxUSE_PRINTING_ARCHITECTURE
+

 wxGraphicsContext* wxGraphicsContext::CreateFromNative( void * context )
 {
     return wxGraphicsRenderer::GetDefaultRenderer()->CreateContextFromNativeContext(context);
 wxGraphicsContext* wxGraphicsContext::CreateFromNative( void * context )
 {
     return wxGraphicsRenderer::GetDefaultRenderer()->CreateContextFromNativeContext(context);