#include "wx/region.h"
#endif
-#ifndef wxMAC_USE_CORE_GRAPHICS_BLEND_MODES
- #define wxMAC_USE_CORE_GRAPHICS_BLEND_MODES 0
+#ifdef __WXMAC__
+#include "wx/mac/private.h"
#endif
-
//-----------------------------------------------------------------------------
// constants
//-----------------------------------------------------------------------------
m_brush = *wxWHITE_BRUSH;
m_graphicContext = NULL;
+ m_logicalFunctionSupported = true;
}
m_graphicContext->DrawIcon( icon , x, y, w, h );
}
+bool wxGCDC::StartDoc( const wxString& WXUNUSED(message) )
+{
+ return false;
+}
+
+void wxGCDC::EndDoc()
+{
+}
+
+void wxGCDC::StartPage()
+{
+}
+
+void wxGCDC::EndPage()
+{
+}
+
+void wxGCDC::Flush()
+{
+#ifdef __WXMAC__
+ CGContextFlush( (CGContextRef) m_graphicContext->GetNativeContext() );
+#endif
+}
+
void wxGCDC::DoSetClippingRegion( wxCoord x, wxCoord y, wxCoord w, wxCoord h )
{
wxCHECK_RET( Ok(), wxT("wxGCDC(cg)::DoSetClippingRegion - invalid DC") );
if (region.Empty())
{
- DestroyClippingRegion();
+ //DestroyClippingRegion();
return;
}
void wxGCDC::DestroyClippingRegion()
{
m_graphicContext->ResetClip();
+ // currently the clip eg of a window extends to the area between the scrollbars
+ // so we must explicitely make sure it only covers the area we want it to draw
+ int width, height ;
+ GetSize( &width , &height ) ;
+ m_graphicContext->Clip( DeviceToLogicalX(0) , DeviceToLogicalY(0) , DeviceToLogicalXRel(width), DeviceToLogicalYRel(height) );
+
m_graphicContext->SetPen( m_pen );
m_graphicContext->SetBrush( m_brush );
m_graphicContext->SetBrush( m_brush );
}
}
-
+
void wxGCDC::SetBackground( const wxBrush &brush )
{
if (m_backgroundBrush == brush)
return;
m_logicalFunction = function;
-#if wxMAC_USE_CORE_GRAPHICS_BLEND_MODES
-
- CGContextRef cgContext = ((wxCairoContext*)(m_graphicContext))->GetNativeContext();
- if ( m_logicalFunction == wxCOPY )
- CGContextSetBlendMode( cgContext, kCGBlendModeNormal );
- else if ( m_logicalFunction == wxINVERT )
- CGContextSetBlendMode( cgContext, kCGBlendModeExclusion );
+ if ( m_graphicContext->SetLogicalFunction( function ) )
+ m_logicalFunctionSupported=true;
else
- CGContextSetBlendMode( cgContext, kCGBlendModeNormal );
-#endif
-
+ m_logicalFunctionSupported=false;
}
bool wxGCDC::DoFloodFill(wxCoord WXUNUSED(x), wxCoord WXUNUSED(y),
{
wxCHECK_RET( Ok(), wxT("wxGCDC(cg)::DoDrawLine - invalid DC") );
-#if !wxMAC_USE_CORE_GRAPHICS_BLEND_MODES
-
- if ( m_logicalFunction != wxCOPY )
+ if ( !m_logicalFunctionSupported )
return;
-#endif
m_graphicContext->StrokeLine(x1,y1,x2,y2);
{
wxCHECK_RET( Ok(), wxT("wxGCDC(cg)::DoCrossHair - invalid DC") );
- if ( m_logicalFunction != wxCOPY )
+ if ( !m_logicalFunctionSupported )
return;
int w = 0, h = 0;
{
wxCHECK_RET( Ok(), wxT("wxGCDC(cg)::DoDrawArc - invalid DC") );
- if ( m_logicalFunction != wxCOPY )
+ if ( !m_logicalFunctionSupported )
return;
double dx = x1 - xc;
{
wxCHECK_RET( Ok(), wxT("wxGCDC(cg)::DoDrawEllipticArc - invalid DC") );
- if ( m_logicalFunction != wxCOPY )
+ if ( !m_logicalFunctionSupported )
return;
- bool fill = m_brush.GetStyle() != wxTRANSPARENT;
-
- wxGraphicsPath path = m_graphicContext->CreatePath();
m_graphicContext->PushState();
- m_graphicContext->Translate(x+w/2,y+h/2);
+ m_graphicContext->Translate(x+w/2.0,y+h/2.0);
wxDouble factor = ((wxDouble) w) / h;
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
// get clockwise angles
- path.AddArc( 0, 0, h/2 , DegToRad(-sa) , DegToRad(-ea), sa > ea );
- if ( fill && (sa!=ea) )
- path.AddLineToPoint(0,0);
+ if ( m_brush.GetStyle() != wxTRANSPARENT )
+ {
+ wxGraphicsPath path = m_graphicContext->CreatePath();
+ path.MoveToPoint( 0, 0 );
+ path.AddLineToPoint( h / 2.0 * cos(DegToRad(sa)) , h / 2.0 * sin(DegToRad(-sa)) );
+ path.AddLineToPoint( h / 2.0 * cos(DegToRad(ea)) , h / 2.0 * sin(DegToRad(-ea)) );
+ path.AddLineToPoint( 0, 0 );
+ m_graphicContext->FillPath( path );
+
+ path = m_graphicContext->CreatePath();
+ path.AddArc( 0, 0, h/2.0 , DegToRad(-sa) , DegToRad(-ea), sa > ea );
+ m_graphicContext->FillPath( path );
+ m_graphicContext->StrokePath( path );
+ }
+ else
+ {
+ wxGraphicsPath path = m_graphicContext->CreatePath();
+ path.AddArc( 0, 0, h/2.0 , DegToRad(-sa) , DegToRad(-ea), sa > ea );
m_graphicContext->DrawPath( path );
+ }
+
m_graphicContext->PopState();
}
{
wxCHECK_RET( Ok(), wxT("wxGCDC(cg)::DoDrawLines - invalid DC") );
-#if !wxMAC_USE_CORE_GRAPHICS_BLEND_MODES
-
- if ( m_logicalFunction != wxCOPY )
+ if ( !m_logicalFunctionSupported )
return;
-#endif
wxPoint2DDouble* pointsD = new wxPoint2DDouble[n];
for( int i = 0; i < n; ++i)
}
#if wxUSE_SPLINES
-void wxGCDC::DoDrawSpline(wxList *points)
+void wxGCDC::DoDrawSpline(const wxPointList *points)
{
wxCHECK_RET( Ok(), wxT("wxGCDC(cg)::DoDrawSpline - invalid DC") );
- if ( m_logicalFunction != wxCOPY )
+ if ( !m_logicalFunctionSupported )
return;
wxGraphicsPath path = m_graphicContext->CreatePath();
- wxList::compatibility_iterator node = points->GetFirst();
- if (node == wxList::compatibility_iterator())
+ wxPointList::compatibility_iterator node = points->GetFirst();
+ if (node == wxPointList::compatibility_iterator())
// empty list
return;
- wxPoint *p = (wxPoint *)node->GetData();
+ wxPoint *p = node->GetData();
wxCoord x1 = p->x;
wxCoord y1 = p->y;
node = node->GetNext();
- p = (wxPoint *)node->GetData();
+ p = node->GetData();
wxCoord x2 = p->x;
wxCoord y2 = p->y;
#endif // !wxUSE_STL
{
- p = (wxPoint *)node->GetData();
+ p = node->GetData();
x1 = x2;
y1 = y2;
x2 = p->x;
if ( n <= 0 || (m_brush.GetStyle() == wxTRANSPARENT && m_pen.GetStyle() == wxTRANSPARENT ) )
return;
- if ( m_logicalFunction != wxCOPY )
+ if ( !m_logicalFunctionSupported )
return;
bool closeIt = false;
{
wxCHECK_RET( Ok(), wxT("wxGCDC(cg)::DoDrawRectangle - invalid DC") );
- if ( m_logicalFunction != wxCOPY )
+ if ( !m_logicalFunctionSupported )
return;
// CMB: draw nothing if transformed w or h is 0
{
wxCHECK_RET( Ok(), wxT("wxGCDC(cg)::DoDrawRoundedRectangle - invalid DC") );
- if ( m_logicalFunction != wxCOPY )
+ if ( !m_logicalFunctionSupported )
return;
if (radius < 0.0)
if (w == 0 || h == 0)
return;
+ if ( m_graphicContext->ShouldOffset() )
+ {
+ // if we are offsetting the entire rectangle is moved 0.5, so the
+ // border line gets off by 1
+ w -= 1;
+ h -= 1;
+ }
m_graphicContext->DrawRoundedRectangle( x,y,w,h,radius);
}
{
wxCHECK_RET( Ok(), wxT("wxGCDC(cg)::DoDrawEllipse - invalid DC") );
- if ( m_logicalFunction != wxCOPY )
+ if ( !m_logicalFunctionSupported )
return;
+ if ( m_graphicContext->ShouldOffset() )
+ {
+ // if we are offsetting the entire rectangle is moved 0.5, so the
+ // border line gets off by 1
+ w -= 1;
+ h -= 1;
+ }
m_graphicContext->DrawEllipse(x,y,w,h);
}
bool wxGCDC::DoBlit(
wxCoord xdest, wxCoord ydest, wxCoord width, wxCoord height,
- wxDC *source, wxCoord xsrc, wxCoord ysrc, int logical_func , bool WXUNUSED(useMask),
+ wxDC *source, wxCoord xsrc, wxCoord ysrc, int logical_func , bool 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") );
+ return DoStretchBlit( xdest, ydest, width, height,
+ source, xsrc, ysrc, width, height, logical_func, useMask,
+ xsrcMask,ysrcMask );
+}
+
+bool wxGCDC::DoStretchBlit(
+ wxCoord xdest, wxCoord ydest, wxCoord dstWidth, wxCoord dstHeight,
+ wxDC *source, wxCoord xsrc, wxCoord ysrc, wxCoord srcWidth, wxCoord srcHeight,
+ int logical_func , bool WXUNUSED(useMask),
+ wxCoord xsrcMask, wxCoord ysrcMask )
+{
+ wxCHECK_MSG( Ok(), false, wxT("wxGCDC(cg)::DoStretchBlit - invalid DC") );
+ wxCHECK_MSG( source->Ok(), false, wxT("wxGCDC(cg)::DoStretchBlit - invalid source DC") );
if ( logical_func == wxNO_OP )
return true;
- else if ( logical_func != wxCOPY )
+ else if ( !m_graphicContext->SetLogicalFunction( logical_func ) )
+
{
wxFAIL_MSG( wxT("Blitting is only supported with wxCOPY logical operation.") );
return false;
ysrcMask = ysrc;
}
- wxRect subrect(source-> LogicalToDeviceX(xsrc),source-> LogicalToDeviceY(ysrc),
- source-> LogicalToDeviceXRel(width),source-> LogicalToDeviceYRel(height));
+ wxRect subrect(source->LogicalToDeviceX(xsrc),
+ source->LogicalToDeviceY(ysrc),
+ source->LogicalToDeviceXRel(srcWidth),
+ source->LogicalToDeviceYRel(srcHeight));
+
+ // if needed clip the subrect down to the size of the source DC
+ wxCoord sw, sh;
+ source->GetSize(&sw, &sh);
+ sw = source->LogicalToDeviceXRel(sw);
+ sh = source->LogicalToDeviceYRel(sh);
+ if (subrect.x + subrect.width > sw)
+ subrect.width = sw - subrect.x;
+ if (subrect.y + subrect.height > sh)
+ subrect.height = sh - subrect.y;
wxBitmap blit = source->GetAsBitmap( &subrect );
if ( blit.Ok() )
{
- m_graphicContext->DrawBitmap( blit, xdest , ydest , width , height );
+ m_graphicContext->DrawBitmap( blit, xdest, ydest,
+ dstWidth, dstHeight);
}
else
{
return false;
}
+ // reset logical function
+ m_graphicContext->SetLogicalFunction( m_logicalFunction );
+
return true;
}
if ( str.length() == 0 )
return;
- if ( m_logicalFunction != wxCOPY )
+ if ( !m_logicalFunctionSupported )
return;
if ( m_backgroundMode == wxTRANSPARENT )
if ( str.length() == 0 )
return;
- if ( m_logicalFunction != wxCOPY )
+
+ if ( !m_logicalFunctionSupported )
return;
if ( m_backgroundMode == wxTRANSPARENT )
void wxGCDC::DoGetTextExtent( const wxString &str, wxCoord *width, wxCoord *height,
wxCoord *descent, wxCoord *externalLeading ,
- wxFont *theFont ) const
+ const wxFont *theFont ) const
{
wxCHECK_RET( Ok(), wxT("wxGCDC(cg)::DoGetTextExtent - invalid DC") );
m_graphicContext->GetTextExtent( str, &w, &h, &d, &e );
if ( height )
- *height = (wxCoord)h;
+ *height = (wxCoord)(h+0.5);
if ( descent )
- *descent = (wxCoord)d;
+ *descent = (wxCoord)(d+0.5);
if ( externalLeading )
- *externalLeading = (wxCoord)e;
+ *externalLeading = (wxCoord)(e+0.5);
if ( width )
- *width = (wxCoord)w;
+ *width = (wxCoord)(w+0.5);
if ( theFont )
{
void wxGCDC::DoGetSize(int *width, int *height) const
{
- *width = 1000;
- *height = 1000;
+ *width = 10000;
+ *height = 10000;
}
void wxGCDC::DoGradientFillLinear(const wxRect& rect,
projects / wxWidgets.git / blobdiff