on demand creation of native CGContexts , so that pure text measuring contexts don...

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

diff --git a/src/common/graphcmn.cpp b/src/common/graphcmn.cpp
index 094186fdf706a0977afafadb07cbb94382f5cb13..f921072da7f4ee7e07fb183468f8a1f6a607d1be 100644 (file)
--- a/src/common/graphcmn.cpp
+++ b/src/common/graphcmn.cpp
@@ -48,9 +48,11 @@ static inline double DegToRad(double deg)
 
 //-----------------------------------------------------------------------------
 
 
 //-----------------------------------------------------------------------------
 

+IMPLEMENT_ABSTRACT_CLASS(wxGraphicsPath, wxObject)
+

 wxPoint2DDouble wxGraphicsPath::GetCurrentPoint()
 {
 wxPoint2DDouble wxGraphicsPath::GetCurrentPoint()
 {

-    wxDouble x,y ;
+    wxDouble x,y;

     GetCurrentPoint(x,y);
     return wxPoint2DDouble(x,y);
 }
     GetCurrentPoint(x,y);
     return wxPoint2DDouble(x,y);
 }


@@ -82,14 +84,14 @@ void wxGraphicsPath::AddArc( const wxPoint2DDouble& c, wxDouble r, wxDouble star
 void wxGraphicsPath::AddQuadCurveToPoint( wxDouble cx, wxDouble cy, wxDouble x, wxDouble y )
 {
     // calculate using degree elevation to a cubic bezier
 void wxGraphicsPath::AddQuadCurveToPoint( wxDouble cx, wxDouble cy, wxDouble x, wxDouble y )
 {
     // calculate using degree elevation to a cubic bezier

-    wxPoint2DDouble c1 ;
-    wxPoint2DDouble c2 ;
+    wxPoint2DDouble c1;
+    wxPoint2DDouble c2;

 
 

-    wxPoint2DDouble start = GetCurrentPoint() ;
+    wxPoint2DDouble start = GetCurrentPoint();

     wxPoint2DDouble end(x,y);
     wxPoint2DDouble c(cx,cy);
     c1 = wxDouble(1/3.0) * start + wxDouble(2/3.0) * c;
     wxPoint2DDouble end(x,y);
     wxPoint2DDouble c(cx,cy);
     c1 = wxDouble(1/3.0) * start + wxDouble(2/3.0) * c;

-    c2 = wxDouble(2/3.0) * c + wxDouble(1/3.0) * end ;
+    c2 = wxDouble(2/3.0) * c + wxDouble(1/3.0) * end;

     AddCurveToPoint(c1.m_x,c1.m_y,c2.m_x,c2.m_y,x,y);
 }
 
     AddCurveToPoint(c1.m_x,c1.m_y,c2.m_x,c2.m_y,x,y);
 }
 


@@ -116,30 +118,30 @@ void wxGraphicsPath::AddArcToPoint( wxDouble x1, wxDouble y1 , wxDouble x2, wxDo
     wxPoint2DDouble p1(x1,y1);
     wxPoint2DDouble p2(x2,y2);
 
     wxPoint2DDouble p1(x1,y1);
     wxPoint2DDouble p2(x2,y2);
 

-    wxPoint2DDouble v1 = current - p1 ;
+    wxPoint2DDouble v1 = current - p1;

     v1.Normalize();
     v1.Normalize();

-    wxPoint2DDouble v2 = p2 - p1 ;
+    wxPoint2DDouble v2 = p2 - p1;

     v2.Normalize();
 
     wxDouble alpha = v1.GetVectorAngle() - v2.GetVectorAngle();
 
     if ( alpha < 0 )
     v2.Normalize();
 
     wxDouble alpha = v1.GetVectorAngle() - v2.GetVectorAngle();
 
     if ( alpha < 0 )

-        alpha = 360 + alpha ;
+        alpha = 360 + alpha;

     // TODO obtuse angles
 
     alpha = DegToRad(alpha);
 
     // TODO obtuse angles
 
     alpha = DegToRad(alpha);
 

-    wxDouble dist = r / sin(alpha/2) * cos(alpha/2) ;
+    wxDouble dist = r / sin(alpha/2) * cos(alpha/2);

     // calculate tangential points
     // calculate tangential points

-    wxPoint2DDouble t1 = dist*v1 + p1 ;
-    wxPoint2DDouble t2 = dist*v2 + p1 ;
+    wxPoint2DDouble t1 = dist*v1 + p1;
+    wxPoint2DDouble t2 = dist*v2 + p1;

 
 

-    wxPoint2DDouble nv1 = v1 ;
+    wxPoint2DDouble nv1 = v1;

     nv1.SetVectorAngle(v1.GetVectorAngle()-90);
     wxPoint2DDouble c = t1 + r*nv1;
 
     nv1.SetVectorAngle(v1.GetVectorAngle()-90);
     wxPoint2DDouble c = t1 + r*nv1;
 

-    wxDouble a1 = v1.GetVectorAngle()+90 ;
-    wxDouble a2 = v2.GetVectorAngle()-90 ;
+    wxDouble a1 = v1.GetVectorAngle()+90;
+    wxDouble a2 = v2.GetVectorAngle()-90;

 
     AddLineToPoint(t1);
     AddArc(c.m_x,c.m_y,r,DegToRad(a1),DegToRad(a2),true);
 
     AddLineToPoint(t1);
     AddArc(c.m_x,c.m_y,r,DegToRad(a1),DegToRad(a2),true);


@@ -150,6 +152,8 @@ void wxGraphicsPath::AddArcToPoint( wxDouble x1, wxDouble y1 , wxDouble x2, wxDo
 // wxGraphicsContext Convenience Methods
 //-----------------------------------------------------------------------------
 
 // wxGraphicsContext Convenience Methods
 //-----------------------------------------------------------------------------
 

+IMPLEMENT_ABSTRACT_CLASS(wxGraphicsContext, wxObject)
+

 void wxGraphicsContext::DrawPath( const wxGraphicsPath *path, int fillStyle )
 {
     FillPath( path , fillStyle );
 void wxGraphicsContext::DrawPath( const wxGraphicsPath *path, int fillStyle )
 {
     FillPath( path , fillStyle );


@@ -158,17 +162,17 @@ void wxGraphicsContext::DrawPath( const wxGraphicsPath *path, int fillStyle )
 
 void wxGraphicsContext::DrawText( const wxString &str, wxDouble x, wxDouble y, wxDouble angle )
 {
 
 void wxGraphicsContext::DrawText( const wxString &str, wxDouble x, wxDouble y, wxDouble angle )
 {

-    Translate(x,y) ;
+    Translate(x,y);

     Rotate( -angle );
     DrawText( str , 0, 0 );
     Rotate( angle );
     Rotate( -angle );
     DrawText( str , 0, 0 );
     Rotate( angle );

-    Translate(-x,-y) ;
+    Translate(-x,-y);

 }
 
 void wxGraphicsContext::StrokeLine( wxDouble x1, wxDouble y1, wxDouble x2, wxDouble y2)
 {
     wxGraphicsPath* path = CreatePath();
 }
 
 void wxGraphicsContext::StrokeLine( wxDouble x1, wxDouble y1, wxDouble x2, wxDouble y2)
 {
     wxGraphicsPath* path = CreatePath();

-    path->MoveToPoint(x1, y1) ;
+    path->MoveToPoint(x1, y1);

     path->AddLineToPoint( x2, y2 );
     StrokePath( path );
     delete path;
     path->AddLineToPoint( x2, y2 );
     StrokePath( path );
     delete path;


@@ -194,8 +198,8 @@ void wxGraphicsContext::DrawEllipse( wxDouble x, wxDouble y, wxDouble w, wxDoubl
     {
         PushState();
         Translate(x+w/2,y+h/2);
     {
         PushState();
         Translate(x+w/2,y+h/2);

-        wxDouble factor = ((wxDouble) w) / h ;
-        Scale( factor , 1.0) ;
+        wxDouble factor = ((wxDouble) w) / h;
+        Scale( factor , 1.0);

         path->AddCircle(0,0,h/2);
         DrawPath(path);
         PopState();
         path->AddCircle(0,0,h/2);
         DrawPath(path);
         PopState();


@@ -232,8 +236,8 @@ void wxGraphicsContext::StrokeLines( size_t n, const wxPoint2DDouble *points)
 {
     wxASSERT(n > 1);
     wxGraphicsPath* path = CreatePath();
 {
     wxASSERT(n > 1);
     wxGraphicsPath* path = CreatePath();

-    path->MoveToPoint(points[0].m_x, points[0].m_y) ;
-    for ( size_t i = 1 ; i < n; ++i)
+    path->MoveToPoint(points[0].m_x, points[0].m_y);
+    for ( size_t i = 1; i < n; ++i)

         path->AddLineToPoint( points[i].m_x, points[i].m_y );
     StrokePath( path );
     delete path;
         path->AddLineToPoint( points[i].m_x, points[i].m_y );
     StrokePath( path );
     delete path;


@@ -243,8 +247,8 @@ void wxGraphicsContext::DrawLines( size_t n, const wxPoint2DDouble *points, int
 {
     wxASSERT(n > 1);
     wxGraphicsPath* path = CreatePath();
 {
     wxASSERT(n > 1);
     wxGraphicsPath* path = CreatePath();

-    path->MoveToPoint(points[0].m_x, points[0].m_y) ;
-    for ( size_t i = 1 ; i < n; ++i)
+    path->MoveToPoint(points[0].m_x, points[0].m_y);
+    for ( size_t i = 1; i < n; ++i)

         path->AddLineToPoint( points[i].m_x, points[i].m_y );
     DrawPath( path , fillStyle);
     delete path;
         path->AddLineToPoint( points[i].m_x, points[i].m_y );
     DrawPath( path , fillStyle);
     delete path;


@@ -254,9 +258,9 @@ void wxGraphicsContext::StrokeLines( size_t n, const wxPoint2DDouble *beginPoint
 {
     wxASSERT(n > 0);
     wxGraphicsPath* path = CreatePath();
 {
     wxASSERT(n > 0);
     wxGraphicsPath* path = CreatePath();

-    for ( size_t i = 0 ; i < n; ++i)
+    for ( size_t i = 0; i < n; ++i)

     {
     {

-        path->MoveToPoint(beginPoints[i].m_x, beginPoints[i].m_y) ;
+        path->MoveToPoint(beginPoints[i].m_x, beginPoints[i].m_y);

         path->AddLineToPoint( endPoints[i].m_x, endPoints[i].m_y );
     }
     StrokePath( path );
         path->AddLineToPoint( endPoints[i].m_x, endPoints[i].m_y );
     }
     StrokePath( path );


@@ -274,6 +278,11 @@ wxGCDC::wxGCDC()
     Init();
 }
 
     Init();
 }
 

+void wxGCDC::SetGraphicsContext( wxGraphicsContext* ctx )
+{ 
+    delete m_graphicContext;
+    m_graphicContext = ctx;
+}

 
 wxGCDC::wxGCDC(const wxWindowDC& dc)
 {
 
 wxGCDC::wxGCDC(const wxWindowDC& dc)
 {


@@ -339,10 +348,8 @@ void wxGCDC::DoDrawIcon( const wxIcon &icon, wxCoord x, wxCoord y )
     m_graphicContext->DrawIcon( icon , xx, yy, ww, hh );
 }
 
     m_graphicContext->DrawIcon( icon , xx, yy, ww, hh );
 }
 

-void wxGCDC::DoSetClippingRegion( wxCoord WXUNUSED(x), wxCoord WXUNUSED(y), wxCoord WXUNUSED(width), wxCoord WXUNUSED(height) )
+void wxGCDC::DoSetClippingRegion( wxCoord x, wxCoord y, wxCoord width, wxCoord height )

 {
 {

-    // TODO Clipping
-#if 0

     wxCHECK_RET( Ok(), wxT("wxGCDC(cg)::DoSetClippingRegion - invalid DC") );
 
     wxCoord xx, yy, ww, hh;
     wxCHECK_RET( Ok(), wxT("wxGCDC(cg)::DoSetClippingRegion - invalid DC") );
 
     wxCoord xx, yy, ww, hh;


@@ -351,13 +358,7 @@ void wxGCDC::DoSetClippingRegion( wxCoord WXUNUSED(x), wxCoord WXUNUSED(y), wxCo
     ww = LogicalToDeviceXRel(width);
     hh = LogicalToDeviceYRel(height);
 
     ww = LogicalToDeviceXRel(width);
     hh = LogicalToDeviceYRel(height);
 

-    CGContextRef cgContext = ((wxCairoContext*)(m_graphicContext))->GetNativeContext();
-    CGRect clipRect = CGRectMake( xx , yy , ww, hh );
-    CGContextClipToRect( cgContext , clipRect );
-
-    //    SetRectRgn( (RgnHandle) m_macCurrentClipRgn , xx , yy , xx + ww , yy + hh );
-    //    SectRgn( (RgnHandle) m_macCurrentClipRgn , (RgnHandle) m_macBoundaryClipRgn , (RgnHandle) m_macCurrentClipRgn );
-
+    m_graphicContext->Clip( xx, yy, ww, hh );

     if ( m_clipping )
     {
         m_clipX1 = wxMax( m_clipX1, xx );
     if ( m_clipping )
     {
         m_clipX1 = wxMax( m_clipX1, xx );


@@ -374,11 +375,6 @@ void wxGCDC::DoSetClippingRegion( wxCoord WXUNUSED(x), wxCoord WXUNUSED(y), wxCo
         m_clipX2 = xx + ww;
         m_clipY2 = yy + hh;
     }
         m_clipX2 = xx + ww;
         m_clipY2 = yy + hh;
     }

-
-    // TODO: as soon as we don't reset the context for each operation anymore
-    // we have to update the context as well
-#endif
-

 }
 
 void wxGCDC::DoSetClippingRegionAsRegion( const wxRegion &region )
 }
 
 void wxGCDC::DoSetClippingRegionAsRegion( const wxRegion &region )


@@ -407,13 +403,7 @@ void wxGCDC::DoSetClippingRegionAsRegion( const wxRegion &region )
     }
     else
     {
     }
     else
     {

-#if 0
-        CopyRgn( (RgnHandle) region.GetWXHRGN() , (RgnHandle) m_macCurrentClipRgn );
-        if ( xx != x || yy != y )
-            OffsetRgn( (RgnHandle) m_macCurrentClipRgn , xx - x , yy - y );
-        SectRgn( (RgnHandle)m_macCurrentClipRgn , (RgnHandle)m_macBoundaryClipRgn , (RgnHandle)m_macCurrentClipRgn );
-#endif
-
+        m_graphicContext->Clip( region );

         if ( m_clipping )
         {
             m_clipX1 = wxMax( m_clipX1, xx );
         if ( m_clipping )
         {
             m_clipX1 = wxMax( m_clipX1, xx );


@@ -435,20 +425,11 @@ void wxGCDC::DoSetClippingRegionAsRegion( const wxRegion &region )
 
 void wxGCDC::DestroyClippingRegion()
 {
 
 void wxGCDC::DestroyClippingRegion()
 {

-    // TODO Clipping
-#if 0
-    //    CopyRgn( (RgnHandle) m_macBoundaryClipRgn , (RgnHandle) m_macCurrentClipRgn );
-
-    CGContextRef cgContext = ((wxCairoContext*)(m_graphicContext))->GetNativeContext();
-    CGContextRestoreGState( cgContext );
-    CGContextSaveGState( cgContext );
-
+    m_graphicContext->ResetClip();

     m_graphicContext->SetPen( m_pen );
     m_graphicContext->SetBrush( m_brush );
 
     m_clipping = false;
     m_graphicContext->SetPen( m_pen );
     m_graphicContext->SetBrush( m_brush );
 
     m_clipping = false;

-#endif
-

 }
 
 void wxGCDC::DoGetSizeMM( int* width, int* height ) const
 }
 
 void wxGCDC::DoGetSizeMM( int* width, int* height ) const


@@ -512,6 +493,7 @@ void wxGCDC::SetMapMode( int mode )
 void wxGCDC::SetUserScale( double x, double y )
 {
     // allow negative ? -> no
 void wxGCDC::SetUserScale( double x, double y )
 {
     // allow negative ? -> no

+

     m_userScaleX = x;
     m_userScaleY = y;
     ComputeScaleAndOrigin();
     m_userScaleX = x;
     m_userScaleY = y;
     ComputeScaleAndOrigin();


@@ -558,12 +540,24 @@ int wxGCDC::GetDepth() const
 
 void wxGCDC::ComputeScaleAndOrigin()
 {
 
 void wxGCDC::ComputeScaleAndOrigin()
 {

-    // this is a bit artificial, but we need to force wxGCDC to think
-    // the pen has changed
-    wxPen pen( GetPen() );
+    // CMB: copy scale to see if it changes
+    double origScaleX = m_scaleX;
+    double origScaleY = m_scaleY;
+    m_scaleX = m_logicalScaleX * m_userScaleX;
+    m_scaleY = m_logicalScaleY * m_userScaleY;
+    m_deviceOriginX = m_deviceOriginX + m_logicalOriginX;
+    m_deviceOriginY = m_deviceOriginY + m_logicalOriginY;

 
 

-    m_pen = wxNullPen;
-    SetPen( pen );
+    // CMB: if scale has changed call SetPen to recalulate the line width
+    if (m_scaleX != origScaleX || m_scaleY != origScaleY)
+    {
+        // this is a bit artificial, but we need to force wxDC to think
+        // the pen has changed
+        wxPen pen(GetPen());
+        m_pen = wxNullPen;
+        SetPen(pen);
+        SetFont(m_font);
+    }

 }
 
 void wxGCDC::SetPalette( const wxPalette& WXUNUSED(palette) )
 }
 
 void wxGCDC::SetPalette( const wxPalette& WXUNUSED(palette) )


@@ -580,7 +574,12 @@ void wxGCDC::SetFont( const wxFont &font )
 {
     m_font = font;
     if ( m_graphicContext )
 {
     m_font = font;
     if ( m_graphicContext )

-        m_graphicContext->SetFont( font );
+    {
+        wxFont f = font;
+        if ( f.Ok() )
+            f.SetPointSize( LogicalToDeviceYRel(font.GetPointSize()));
+        m_graphicContext->SetFont( f );
+    }

 }
 
 void wxGCDC::SetPen( const wxPen &pen )
 }
 
 void wxGCDC::SetPen( const wxPen &pen )


@@ -803,8 +802,8 @@ void wxGCDC::DoDrawEllipticArc( wxCoord x, wxCoord y, wxCoord w, wxCoord h,
     wxGraphicsPath* path = m_graphicContext->CreatePath();
     m_graphicContext->PushState();
     m_graphicContext->Translate(xx+ww/2,yy+hh/2);
     wxGraphicsPath* path = m_graphicContext->CreatePath();
     m_graphicContext->PushState();
     m_graphicContext->Translate(xx+ww/2,yy+hh/2);

-    wxDouble factor = ((wxDouble) ww) / hh ;
-    m_graphicContext->Scale( factor , 1.0) ;
+    wxDouble factor = ((wxDouble) ww) / hh;
+    m_graphicContext->Scale( factor , 1.0);

     if ( fill && (sa!=ea) )
         path->MoveToPoint(0,0);
     // since these angles (ea,sa) are measured counter-clockwise, we invert them to
     if ( fill && (sa!=ea) )
         path->MoveToPoint(0,0);
     // since these angles (ea,sa) are measured counter-clockwise, we invert them to


@@ -835,14 +834,14 @@ void wxGCDC::DoDrawLines(int n, wxPoint points[],
         return;
 #endif
 
         return;
 #endif
 

-    wxPoint2DDouble* pointsD = new wxPoint2DDouble[n] ;
-    for( int i = 0 ; i < n; ++i)
+    wxPoint2DDouble* pointsD = new wxPoint2DDouble[n];
+    for( int i = 0; i < n; ++i)

     {
         pointsD[i].m_x = LogicalToDeviceX(points[i].x + xoffset);
         pointsD[i].m_y = LogicalToDeviceY(points[i].y + yoffset);
     }
 
     {
         pointsD[i].m_x = LogicalToDeviceX(points[i].x + xoffset);
         pointsD[i].m_y = LogicalToDeviceY(points[i].y + yoffset);
     }
 

-    m_graphicContext->StrokeLines( n , pointsD) ;
+    m_graphicContext->StrokeLines( n , pointsD);

     delete[] pointsD;
 }
 
     delete[] pointsD;
 }
 


@@ -919,12 +918,12 @@ void wxGCDC::DoDrawPolygon( int n, wxPoint points[],
     if ( m_logicalFunction != wxCOPY )
         return;
 
     if ( m_logicalFunction != wxCOPY )
         return;
 

-    bool closeIt = false ;
+    bool closeIt = false;

     if (points[n-1] != points[0])
     if (points[n-1] != points[0])

-        closeIt = true ;
+        closeIt = true;

 
 

-    wxPoint2DDouble* pointsD = new wxPoint2DDouble[n+(closeIt?1:0)] ;
-    for( int i = 0 ; i < n; ++i)
+    wxPoint2DDouble* pointsD = new wxPoint2DDouble[n+(closeIt?1:0)];
+    for( int i = 0; i < n; ++i)

     {
         pointsD[i].m_x = LogicalToDeviceX(points[i].x + xoffset);
         pointsD[i].m_y = LogicalToDeviceY(points[i].y + yoffset);
     {
         pointsD[i].m_x = LogicalToDeviceX(points[i].x + xoffset);
         pointsD[i].m_y = LogicalToDeviceY(points[i].y + yoffset);


@@ -932,7 +931,7 @@ void wxGCDC::DoDrawPolygon( int n, wxPoint points[],
     if ( closeIt )
         pointsD[n] = pointsD[0];
 
     if ( closeIt )
         pointsD[n] = pointsD[0];
 

-    m_graphicContext->DrawLines( n+(closeIt?1:0) , pointsD, fillStyle) ;
+    m_graphicContext->DrawLines( n+(closeIt?1:0) , pointsD, fillStyle);

     delete[] pointsD;
 }
 
     delete[] pointsD;
 }
 


@@ -946,17 +945,17 @@ void wxGCDC::DoDrawPolyPolygon(int n,
     wxASSERT(n > 1);
     wxGraphicsPath* path = m_graphicContext->CreatePath();
 
     wxASSERT(n > 1);
     wxGraphicsPath* path = m_graphicContext->CreatePath();
 

-    int i = 0 ;
-    for ( int j = 0 ; j < n ; ++j)
+    int i = 0;
+    for ( int j = 0; j < n; ++j)

     {
         wxPoint start = points[i];
     {
         wxPoint start = points[i];

-        path->MoveToPoint(LogicalToDeviceX(start.x+ xoffset), LogicalToDeviceY(start.y+ yoffset)) ;
+        path->MoveToPoint(LogicalToDeviceX(start.x+ xoffset), LogicalToDeviceY(start.y+ yoffset));

         ++i;
         int l = count[j];
         ++i;
         int l = count[j];

-        for ( int k = 1 ; k < l ; ++k)
+        for ( int k = 1; k < l; ++k)

         {
             path->AddLineToPoint( LogicalToDeviceX(points[i].x+ xoffset), LogicalToDeviceY(points[i].y+ yoffset));
         {
             path->AddLineToPoint( LogicalToDeviceX(points[i].x+ xoffset), LogicalToDeviceY(points[i].y+ yoffset));

-            ++i ;
+            ++i;

         }
         // close the polygon
         if ( start != points[i-1])
         }
         // close the polygon
         if ( start != points[i-1])


@@ -1038,10 +1037,10 @@ void wxGCDC::DoDrawEllipse(wxCoord x, wxCoord y, wxCoord width, wxCoord height)
     if ( m_logicalFunction != wxCOPY )
         return;
 
     if ( m_logicalFunction != wxCOPY )
         return;
 

-    wxCoord xx = LogicalToDeviceX(x);
-    wxCoord yy = LogicalToDeviceY(y);
+    wxDouble xx = LogicalToDeviceX(x);
+    wxDouble yy = LogicalToDeviceY(y);

     wxDouble ww = m_signX * LogicalToDeviceXRel(width);
     wxDouble ww = m_signX * LogicalToDeviceXRel(width);

-    wxCoord hh = m_signY * LogicalToDeviceYRel(height);
+    wxDouble hh = m_signY * LogicalToDeviceYRel(height);

 
     // CMB: draw nothing if transformed w or h is 0
     if (ww == 0 || hh == 0)
 
     // CMB: draw nothing if transformed w or h is 0
     if (ww == 0 || hh == 0)


@@ -1068,9 +1067,9 @@ bool wxGCDC::CanDrawBitmap() const
 }
 
 bool wxGCDC::DoBlit(
 }
 
 bool wxGCDC::DoBlit(

-    wxCoord WXUNUSED(xdest), wxCoord WXUNUSED(ydest), wxCoord WXUNUSED(width), wxCoord WXUNUSED(height),
-    wxDC *source, wxCoord WXUNUSED(xsrc), wxCoord WXUNUSED(ysrc), int logical_func , bool WXUNUSED(useMask),
-    wxCoord WXUNUSED(xsrcMask), wxCoord WXUNUSED(ysrcMask) )
+    wxCoord xdest, wxCoord ydest, wxCoord width, wxCoord height,
+    wxDC *source, wxCoord xsrc, wxCoord ysrc, int logical_func , bool WXUNUSED(useMask),
+    wxCoord xsrcMask, wxCoord ysrcMask )

 {
     wxCHECK_MSG( Ok(), false, wxT("wxGCDC(cg)::DoBlit - invalid DC") );
     wxCHECK_MSG( source->Ok(), false, wxT("wxGCDC(cg)::DoBlit - invalid source DC") );
 {
     wxCHECK_MSG( Ok(), false, wxT("wxGCDC(cg)::DoBlit - invalid DC") );
     wxCHECK_MSG( source->Ok(), false, wxT("wxGCDC(cg)::DoBlit - invalid source DC") );


@@ -1078,7 +1077,6 @@ bool wxGCDC::DoBlit(
     if ( logical_func == wxNO_OP )
         return true;
 
     if ( logical_func == wxNO_OP )
         return true;
 

-#if 0

     if (xsrcMask == -1 && ysrcMask == -1)
     {
         xsrcMask = xsrc;
     if (xsrcMask == -1 && ysrcMask == -1)
     {
         xsrcMask = xsrc;


@@ -1095,10 +1093,10 @@ bool wxGCDC::DoBlit(
     wxCoord wwdest = LogicalToDeviceXRel(width);
     wxCoord hhdest = LogicalToDeviceYRel(height);
 
     wxCoord wwdest = LogicalToDeviceXRel(width);
     wxCoord hhdest = LogicalToDeviceYRel(height);
 

-    wxMemoryDC* memdc = dynamic_cast<wxMemoryDC*>(source);
+    wxMemoryDC* memdc = wxDynamicCast(source,wxMemoryDC);

     if ( memdc && logical_func == wxCOPY )
     {
     if ( memdc && logical_func == wxCOPY )
     {

-        wxBitmap blit = memdc->GetSelectedObject();
+        wxBitmap blit = memdc->GetSelectedBitmap();

 
         wxASSERT_MSG( blit.Ok() , wxT("Invalid bitmap for blitting") );
 
 
         wxASSERT_MSG( blit.Ok() , wxT("Invalid bitmap for blitting") );
 


@@ -1134,16 +1132,14 @@ bool wxGCDC::DoBlit(
         {
             m_graphicContext->DrawBitmap( blit, xxdest , yydest , wwdest , hhdest );
         }
         {
             m_graphicContext->DrawBitmap( blit, xxdest , yydest , wwdest , hhdest );
         }

-

     }
     else
     {
     }
     else
     {

-        wxFAIL_MSG( wxT("Blitting is only supported from bitmap contexts") );
+        wxFAIL_MSG( wxT("Blitting is only supported from bitmap contexts, and only with wxCOPY logical operation.") );

         return false;
     }
         return false;
     }

-#endif

 
 

-    return false;
+    return true;

 }
 
 void wxGCDC::DoDrawRotatedText(const wxString& str, wxCoord x, wxCoord y,
 }
 
 void wxGCDC::DoDrawRotatedText(const wxString& str, wxCoord x, wxCoord y,


@@ -1200,13 +1196,13 @@ void wxGCDC::DoGetTextExtent( const wxString &str, wxCoord *width, wxCoord *heig
     m_graphicContext->GetTextExtent( str, &w, &h, &d, &e );
 
     if ( height )
     m_graphicContext->GetTextExtent( str, &w, &h, &d, &e );
 
     if ( height )

-        *height = DeviceToLogicalYRel( h );
+        *height = DeviceToLogicalYRel((wxCoord)h);

     if ( descent )
     if ( descent )

-        *descent =DeviceToLogicalYRel( d);
+        *descent = DeviceToLogicalYRel((wxCoord)d);

     if ( externalLeading )
     if ( externalLeading )

-        *externalLeading = DeviceToLogicalYRel( e);
+        *externalLeading = DeviceToLogicalYRel((wxCoord)e);

     if ( width )
     if ( width )

-        *width = DeviceToLogicalXRel( w );
+        *width = DeviceToLogicalXRel((wxCoord)w);

 
     if ( theFont )
     {
 
     if ( theFont )
     {


@@ -1220,13 +1216,13 @@ bool wxGCDC::DoGetPartialTextExtents(const wxString& text, wxArrayInt& widths) c
     widths.Clear();
     widths.Add(0,text.Length());
     if ( text.IsEmpty() )
     widths.Clear();
     widths.Add(0,text.Length());
     if ( text.IsEmpty() )

-        return true ;
+        return true;

 
 

-    wxArrayDouble widthsD ;
+    wxArrayDouble widthsD;

 
     m_graphicContext->GetPartialTextExtents( text, widthsD );
     for ( size_t i = 0; i < widths.GetCount(); ++i )
 
     m_graphicContext->GetPartialTextExtents( text, widthsD );
     for ( size_t i = 0; i < widths.GetCount(); ++i )

-        widths[i] = DeviceToLogicalXRel( widthsD[i] + 0.5 ) ;
+        widths[i] = DeviceToLogicalXRel((wxCoord)(widthsD[i] + 0.5));

 
     return true;
 }
 
     return true;
 }


@@ -1250,7 +1246,13 @@ wxCoord wxGCDC::GetCharHeight(void) const
 void wxGCDC::Clear(void)
 {
     wxCHECK_RET( Ok(), wxT("wxGCDC(cg)::Clear - invalid DC") );
 void wxGCDC::Clear(void)
 {
     wxCHECK_RET( Ok(), wxT("wxGCDC(cg)::Clear - invalid DC") );

-    // TODO
+    // TODO better implementation / incorporate size info into wxGCDC or context
+    m_graphicContext->SetBrush( m_backgroundBrush );
+    wxPen p = *wxTRANSPARENT_PEN;
+    m_graphicContext->SetPen( p );
+    DoDrawRectangle( 0, 0, 32000 , 32000 );
+    m_graphicContext->SetPen( m_pen );    
+    m_graphicContext->SetBrush( m_brush );

 }
 
 void wxGCDC::DoGetSize(int *width, int *height) const
 }
 
 void wxGCDC::DoGetSize(int *width, int *height) const


@@ -1264,40 +1266,42 @@ void wxGCDC::DoGradientFillLinear(const wxRect& rect,
                                   const wxColour& destColour,
                                   wxDirection nDirection )
 {
                                   const wxColour& destColour,
                                   wxDirection nDirection )
 {

-    wxPoint start ;
-    wxPoint end ;
+    wxPoint start;
+    wxPoint end;

     switch( nDirection)
     {
     case wxWEST :
         start = rect.GetRightBottom();
         start.x++;
         end = rect.GetLeftBottom();
     switch( nDirection)
     {
     case wxWEST :
         start = rect.GetRightBottom();
         start.x++;
         end = rect.GetLeftBottom();

-        break ;
+        break;

     case wxEAST :
         start = rect.GetLeftBottom();
         end = rect.GetRightBottom();
         end.x++;
     case wxEAST :
         start = rect.GetLeftBottom();
         end = rect.GetRightBottom();
         end.x++;

-        break ;
+        break;

     case wxNORTH :
         start = rect.GetLeftBottom();
         start.y++;
         end = rect.GetLeftTop();
     case wxNORTH :
         start = rect.GetLeftBottom();
         start.y++;
         end = rect.GetLeftTop();

-        break ;
+        break;

     case wxSOUTH :
         start = rect.GetLeftTop();
         end = rect.GetLeftBottom();
         end.y++;
     case wxSOUTH :
         start = rect.GetLeftTop();
         end = rect.GetLeftBottom();
         end.y++;

-        break ;
+        break;
+    default :
+        break;

     }
 
     m_graphicContext->SetLinearGradientBrush(
         LogicalToDeviceX(start.x),LogicalToDeviceY(start.y),
         LogicalToDeviceX(end.x),LogicalToDeviceY(end.y), initialColour, destColour);
 
     }
 
     m_graphicContext->SetLinearGradientBrush(
         LogicalToDeviceX(start.x),LogicalToDeviceY(start.y),
         LogicalToDeviceX(end.x),LogicalToDeviceY(end.y), initialColour, destColour);
 

-    wxCoord xx = LogicalToDeviceX(rect.x);
-    wxCoord yy = LogicalToDeviceY(rect.y);
+    wxDouble xx = LogicalToDeviceX(rect.x);
+    wxDouble yy = LogicalToDeviceY(rect.y);

     wxDouble ww = m_signX * LogicalToDeviceXRel(rect.width);
     wxDouble ww = m_signX * LogicalToDeviceXRel(rect.width);

-    wxCoord hh = m_signY * LogicalToDeviceYRel(rect.height);
+    wxDouble hh = m_signY * LogicalToDeviceYRel(rect.height);

 
     if (ww == 0 || hh == 0)
         return;
 
     if (ww == 0 || hh == 0)
         return;


@@ -1332,10 +1336,10 @@ void wxGCDC::DoGradientFillConcentric(const wxRect& rect,
     else
         nRadius = cy;
 
     else
         nRadius = cy;
 

-    wxCoord xx = LogicalToDeviceX(rect.x);
-    wxCoord yy = LogicalToDeviceY(rect.y);
+    wxDouble xx = LogicalToDeviceX(rect.x);
+    wxDouble yy = LogicalToDeviceY(rect.y);

     wxDouble ww = m_signX * LogicalToDeviceXRel(rect.width);
     wxDouble ww = m_signX * LogicalToDeviceXRel(rect.width);

-    wxCoord hh = m_signY * LogicalToDeviceYRel(rect.height);
+    wxDouble hh = m_signY * LogicalToDeviceYRel(rect.height);

 
     if (ww == 0 || hh == 0)
         return;
 
     if (ww == 0 || hh == 0)
         return;


@@ -1352,7 +1356,7 @@ void wxGCDC::DoGradientFillConcentric(const wxRect& rect,
     }
 
     m_graphicContext->SetPen(*wxTRANSPARENT_PEN);
     }
 
     m_graphicContext->SetPen(*wxTRANSPARENT_PEN);

-    m_graphicContext->SetBrush( wxBrush( destColour) ) ;
+    m_graphicContext->SetBrush( wxBrush( destColour) );

     m_graphicContext->DrawRectangle( xx,yy,ww,hh);
 
     m_graphicContext->SetRadialGradientBrush(
     m_graphicContext->DrawRectangle( xx,yy,ww,hh);
 
     m_graphicContext->SetRadialGradientBrush(