X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/6d0d84554854a19db991ba64e7e034e1fc898ef0..02fd8b9b6186623ed61019ac7e69ed9a4ef16773:/src/common/dcgraph.cpp?ds=sidebyside

diff --git a/src/common/dcgraph.cpp b/src/common/dcgraph.cpp
index 42742a48b9..4a713993a8 100644
--- a/src/common/dcgraph.cpp
+++ b/src/common/dcgraph.cpp
@@ -30,7 +30,7 @@
 
 #include "wx/dcclient.h"
 
-#ifdef __WXOSX__
+#ifdef __WXOSX_OR_COCOA__
 #ifdef __WXOSX_IPHONE__
     #include <CoreGraphics/CoreGraphics.h>
 #else
@@ -168,23 +168,34 @@ wxGCDCImpl::~wxGCDCImpl()
     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 )
@@ -217,7 +228,7 @@ void wxGCDCImpl::EndPage()
 
 void wxGCDCImpl::Flush()
 {
-#ifdef __WXOSX__
+#ifdef __WXOSX_OR_COCOA__
     CGContextFlush( (CGContextRef) m_graphicContext->GetNativeContext() );
 #endif
 }
@@ -325,7 +336,7 @@ void wxGCDCImpl::SetTextBackground( const wxColour &col )
     m_textBackgroundColour = col;
 }
 
-void wxGCDCImpl::SetMapMode( int mode )
+void wxGCDCImpl::SetMapMode( wxMappingMode mode )
 {
     switch (mode)
     {
@@ -371,13 +382,13 @@ void wxGCDCImpl::ComputeScaleAndOrigin()
     if ( m_graphicContext )
     {
         m_matrixCurrent = m_graphicContext->CreateMatrix();
-        
+
         // the logical origin sets the origin to have new coordinates
-        m_matrixCurrent.Translate( m_deviceOriginX - m_logicalOriginX * m_signX * m_scaleX, 
+        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 );
     }
@@ -439,7 +450,7 @@ void wxGCDCImpl::SetBackground( const wxBrush &brush )
         return;
 }
 
-void wxGCDCImpl::SetLogicalFunction( int function )
+void wxGCDCImpl::SetLogicalFunction( wxRasterOperationMode function )
 {
     if (m_logicalFunction == function)
         return;
@@ -452,7 +463,8 @@ void wxGCDCImpl::SetLogicalFunction( int function )
 }
 
 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;
 }
@@ -663,8 +675,8 @@ void wxGCDCImpl::DoDrawSpline(const wxPointList *points)
 #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") );
 
@@ -695,7 +707,7 @@ void wxGCDCImpl::DoDrawPolyPolygon(int n,
                                wxPoint points[],
                                wxCoord xoffset,
                                wxCoord yoffset,
-                               int fillStyle)
+                               wxPolygonFillMode fillStyle)
 {
     wxASSERT(n > 1);
     wxGraphicsPath path = m_graphicContext->CreatePath();
@@ -790,7 +802,8 @@ bool wxGCDCImpl::CanDrawBitmap() const
 
 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,
@@ -801,7 +814,7 @@ bool wxGCDCImpl::DoBlit(
 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") );
@@ -810,7 +823,6 @@ bool wxGCDCImpl::DoStretchBlit(
     if ( logical_func == wxNO_OP )
         return true;
     else if ( !m_graphicContext->SetLogicalFunction( logical_func ) )
-
     {
         wxFAIL_MSG( wxT("Blitting is only supported with wxCOPY logical operation.") );
         return false;
@@ -841,6 +853,9 @@ bool wxGCDCImpl::DoStretchBlit(
 
     if ( blit.IsOk() )
     {
+        if ( !useMask && blit.GetMask() )
+            blit.SetMask(NULL);
+
         m_graphicContext->DrawBitmap( blit, xdest, ydest,
                                       dstWidth, dstHeight);
     }
@@ -874,7 +889,7 @@ 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;