#include "wx/dcclient.h"
-#ifdef __WXOSX__
- #include "ApplicationServices/ApplicationServices.h"
+#ifdef __WXOSX_OR_COCOA__
+#ifdef __WXOSX_IPHONE__
+ #include <CoreGraphics/CoreGraphics.h>
+#else
+ #include <ApplicationServices/ApplicationServices.h>
+#endif
#endif
//-----------------------------------------------------------------------------
return (deg * M_PI) / 180.0;
}
+static bool TranslateRasterOp(wxRasterOperationMode function, wxCompositionMode *op)
+{
+ switch ( function )
+ {
+ case wxCOPY: // (default) src
+ *op = wxCOMPOSITION_SOURCE; //
+ break;
+ case wxOR: // src OR dst
+ *op = wxCOMPOSITION_ADD;
+ break;
+ case wxNO_OP: // dst
+ *op = wxCOMPOSITION_DEST; // ignore the source
+ break;
+ case wxCLEAR: // 0
+ *op = wxCOMPOSITION_CLEAR;// clear dst
+ break;
+ case wxXOR: // src XOR dst
+ *op = wxCOMPOSITION_XOR;
+ break;
+
+ case wxAND: // src AND dst
+ case wxAND_INVERT: // (NOT src) AND dst
+ case wxAND_REVERSE:// src AND (NOT dst)
+ case wxEQUIV: // (NOT src) XOR dst
+ case wxINVERT: // NOT dst
+ case wxNAND: // (NOT src) OR (NOT dst)
+ case wxNOR: // (NOT src) AND (NOT dst)
+ case wxOR_INVERT: // (NOT src) OR dst
+ case wxOR_REVERSE: // src OR (NOT dst)
+ case wxSET: // 1
+ case wxSRC_INVERT: // NOT src
+ default:
+ return false;
+ }
+ return true;
+}
+
//-----------------------------------------------------------------------------
// wxDC bridge class
//-----------------------------------------------------------------------------
{
}
+#if wxUSE_PRINTING_ARCHITECTURE
wxGCDC::wxGCDC( const wxPrinterDC& dc) :
wxDC( new wxGCDCImpl( this, dc ) )
{
}
+#endif
wxGCDC::wxGCDC() :
wxDC( new wxGCDCImpl( this ) )
SetGraphicsContext( wxGraphicsContext::Create(dc) );
}
+#if wxUSE_PRINTING_ARCHITECTURE
wxGCDCImpl::wxGCDCImpl( wxDC *owner, const wxPrinterDC& dc ) :
wxDCImpl( owner )
{
Init();
SetGraphicsContext( wxGraphicsContext::Create(dc) );
}
+#endif
void wxGCDCImpl::Init()
{
delete m_graphicContext;
}
-void wxGCDCImpl::DoDrawBitmap( const wxBitmap &bmp, wxCoord x, wxCoord y, bool WXUNUSED(useMask) )
+void wxGCDCImpl::DoDrawBitmap( const wxBitmap &bmp, wxCoord x, wxCoord y,
+ bool useMask )
{
wxCHECK_RET( IsOk(), wxT("wxGCDC(cg)::DoDrawBitmap - invalid DC") );
wxCHECK_RET( bmp.IsOk(), wxT("wxGCDC(cg)::DoDrawBitmap - invalid bitmap") );
+ int w = bmp.GetWidth();
+ int h = bmp.GetHeight();
if ( bmp.GetDepth() == 1 )
{
m_graphicContext->SetPen(*wxTRANSPARENT_PEN);
m_graphicContext->SetBrush( wxBrush( m_textBackgroundColour , wxSOLID ) );
- m_graphicContext->DrawRectangle( x , y , bmp.GetWidth() , bmp.GetHeight() );
+ m_graphicContext->DrawRectangle( x, y, w, h );
m_graphicContext->SetBrush( wxBrush( m_textForegroundColour , wxSOLID ) );
- m_graphicContext->DrawBitmap( bmp, x , y , bmp.GetWidth() , bmp.GetHeight() );
+ m_graphicContext->DrawBitmap( bmp, x, y, w, h );
m_graphicContext->SetBrush( m_graphicContext->CreateBrush(m_brush));
m_graphicContext->SetPen( m_graphicContext->CreatePen(m_pen));
}
- else
- m_graphicContext->DrawBitmap( bmp, x , y , bmp.GetWidth() , bmp.GetHeight() );
+ else // not a monochrome bitmap, handle it normally
+ {
+ // make a copy in case we need to remove its mask, if we don't modify
+ // it the copy is cheap as bitmaps are reference-counted
+ wxBitmap bmpCopy(bmp);
+ if ( !useMask && bmp.GetMask() )
+ bmpCopy.SetMask(NULL);
+
+ m_graphicContext->DrawBitmap( bmpCopy, x, y, w, h );
+ }
}
void wxGCDCImpl::DoDrawIcon( const wxIcon &icon, wxCoord x, wxCoord y )
void wxGCDCImpl::Flush()
{
-#ifdef __WXOSX__
+#ifdef __WXOSX_OR_COCOA__
CGContextFlush( (CGContextRef) m_graphicContext->GetNativeContext() );
#endif
}
}
}
-void wxGCDCImpl::DoSetClippingRegionAsRegion( const wxRegion ®ion )
+void wxGCDCImpl::DoSetDeviceClippingRegion( const wxRegion ®ion )
{
// region is in device coordinates
- wxCHECK_RET( IsOk(), wxT("wxGCDC(cg)::DoSetClippingRegionAsRegion - invalid DC") );
+ wxCHECK_RET( IsOk(), wxT("wxGCDC(cg)::DoSetDeviceClippingRegion - invalid DC") );
if (region.Empty())
{
m_textBackgroundColour = col;
}
-void wxGCDCImpl::SetMapMode( int mode )
+void wxGCDCImpl::SetMapMode( wxMappingMode mode )
{
switch (mode)
{
if ( m_graphicContext )
{
m_matrixCurrent = m_graphicContext->CreateMatrix();
- m_matrixCurrent.Translate( m_deviceOriginX, m_deviceOriginY );
- m_matrixCurrent.Scale( m_scaleX, m_scaleY );
+
// the logical origin sets the origin to have new coordinates
- m_matrixCurrent.Translate( -m_logicalOriginX, -m_logicalOriginY );
+ m_matrixCurrent.Translate( m_deviceOriginX - m_logicalOriginX * m_signX * m_scaleX,
+ m_deviceOriginY-m_logicalOriginY * m_signY * m_scaleY);
+
+ m_matrixCurrent.Scale( m_scaleX * m_signX, m_scaleY * m_signY );
m_graphicContext->SetTransform( m_matrixOriginal );
m_graphicContext->ConcatTransform( m_matrixCurrent );
if ( f.IsOk() )
f.SetPointSize( /*LogicalToDeviceYRel*/(font.GetPointSize()));
m_graphicContext->SetFont( f, m_textForegroundColour );
+#if defined(__WXGTK__) || defined(__WXOSX__)
+ if ( m_font.GetNoAntiAliasing() )
+ {
+ m_graphicContext->SetAntialiasMode(wxANTIALIAS_NONE);
+ }
+#endif
}
}
return;
}
-void wxGCDCImpl::SetLogicalFunction( int function )
+void wxGCDCImpl::SetLogicalFunction( wxRasterOperationMode function )
{
if (m_logicalFunction == function)
return;
m_logicalFunction = function;
- if ( m_graphicContext->SetLogicalFunction( function ) )
- m_logicalFunctionSupported=true;
+
+ wxCompositionMode mode;
+ m_logicalFunctionSupported = TranslateRasterOp( function, &mode);
+ if (m_logicalFunctionSupported)
+ m_logicalFunctionSupported = m_graphicContext->SetCompositionMode(mode);
+
+ if (mode == wxCOMPOSITION_XOR)
+ m_graphicContext->SetAntialiasMode(wxANTIALIAS_NONE);
else
- m_logicalFunctionSupported=false;
+ m_graphicContext->SetAntialiasMode(wxANTIALIAS_DEFAULT);
}
bool wxGCDCImpl::DoFloodFill(wxCoord WXUNUSED(x), wxCoord WXUNUSED(y),
- const wxColour& WXUNUSED(col), int WXUNUSED(style))
+ const wxColour& WXUNUSED(col),
+ wxFloodFillStyle WXUNUSED(style))
{
return false;
}
{
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.AddArc( 0, 0, h/2.0 , DegToRad(-sa) , DegToRad(-ea), sa > 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 );
+ path.AddArc( 0, 0, h/2.0 , DegToRad(-sa) , DegToRad(-ea), sa > ea );
+ m_graphicContext->DrawPath( path );
}
m_graphicContext->PopState();
#endif // wxUSE_SPLINES
void wxGCDCImpl::DoDrawPolygon( int n, wxPoint points[],
- wxCoord xoffset, wxCoord yoffset,
- int fillStyle )
+ wxCoord xoffset, wxCoord yoffset,
+ wxPolygonFillMode fillStyle )
{
wxCHECK_RET( IsOk(), wxT("wxGCDC(cg)::DoDrawPolygon - invalid DC") );
wxPoint points[],
wxCoord xoffset,
wxCoord yoffset,
- int fillStyle)
+ wxPolygonFillMode fillStyle)
{
wxASSERT(n > 1);
wxGraphicsPath path = m_graphicContext->CreatePath();
bool wxGCDCImpl::DoBlit(
wxCoord xdest, wxCoord ydest, wxCoord width, wxCoord height,
- wxDC *source, wxCoord xsrc, wxCoord ysrc, int logical_func , bool useMask,
+ wxDC *source, wxCoord xsrc, wxCoord ysrc,
+ wxRasterOperationMode logical_func , bool useMask,
wxCoord xsrcMask, wxCoord ysrcMask )
{
return DoStretchBlit( xdest, ydest, width, height,
bool wxGCDCImpl::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),
+ wxRasterOperationMode logical_func , bool useMask,
wxCoord xsrcMask, wxCoord ysrcMask )
{
wxCHECK_MSG( IsOk(), false, wxT("wxGCDC(cg)::DoStretchBlit - invalid DC") );
if ( logical_func == wxNO_OP )
return true;
- else if ( !m_graphicContext->SetLogicalFunction( logical_func ) )
-
+
+ wxCompositionMode mode;
+ if ( !TranslateRasterOp(logical_func, &mode) )
{
- wxFAIL_MSG( wxT("Blitting is only supported with wxCOPY logical operation.") );
+ wxFAIL_MSG( wxT("Blitting is not supported with this logical operation.") );
return false;
}
- if (xsrcMask == -1 && ysrcMask == -1)
+ bool retval = true;
+
+ wxCompositionMode formerMode = m_graphicContext->GetCompositionMode();
+ if (m_graphicContext->SetCompositionMode(mode))
{
- xsrcMask = xsrc;
- ysrcMask = ysrc;
- }
+ wxAntialiasMode formerAa = m_graphicContext->GetAntialiasMode();
+ if (mode == wxCOMPOSITION_XOR)
+ {
+ m_graphicContext->SetAntialiasMode(wxANTIALIAS_NONE);
+ }
+
+ if (xsrcMask == -1 && ysrcMask == -1)
+ {
+ xsrcMask = xsrc;
+ ysrcMask = ysrc;
+ }
- wxRect subrect(source->LogicalToDeviceX(xsrc),
- source->LogicalToDeviceY(ysrc),
- source->LogicalToDeviceXRel(srcWidth),
- source->LogicalToDeviceYRel(srcHeight));
+ 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;
+ // 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 );
+ wxBitmap blit = source->GetAsBitmap( &subrect );
- if ( blit.IsOk() )
- {
- m_graphicContext->DrawBitmap( blit, xdest, ydest,
- dstWidth, dstHeight);
- }
- else
- {
- wxFAIL_MSG( wxT("Cannot Blit. Unable to get contents of DC as bitmap.") );
- return false;
- }
+ if ( blit.IsOk() )
+ {
+ if ( !useMask && blit.GetMask() )
+ blit.SetMask(NULL);
- // reset logical function
- m_graphicContext->SetLogicalFunction( m_logicalFunction );
+ m_graphicContext->DrawBitmap( blit, xdest, ydest,
+ dstWidth, dstHeight);
+ }
+ else
+ {
+ wxFAIL_MSG( wxT("Cannot Blit. Unable to get contents of DC as bitmap.") );
+ retval = false;
+ }
+
+ if (mode == wxCOMPOSITION_XOR)
+ {
+ m_graphicContext->SetAntialiasMode(formerAa);
+ }
+ }
+ // reset composition
+ m_graphicContext->SetCompositionMode(formerMode);
- return true;
+ return retval;
}
void wxGCDCImpl::DoDrawRotatedText(const wxString& str, wxCoord x, wxCoord y,
void wxGCDCImpl::DoDrawText(const wxString& str, wxCoord x, wxCoord y)
{
- wxCHECK_RET( IsOk(), wxT("wxGCDC(cg)::DoDrawRotatedText - invalid DC") );
+ wxCHECK_RET( IsOk(), wxT("wxGCDC(cg)::DoDrawText - invalid DC") );
if ( str.length() == 0 )
return;
projects / wxWidgets.git / blobdiff