X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/ba49d2acf95d53517719c4fd9ac2ad5aaa13540b..8c6471af3cf87c97f5f1564c601237caf9fdeb60:/src/generic/graphicc.cpp

diff --git a/src/generic/graphicc.cpp b/src/generic/graphicc.cpp
index 900acd4957..1cf971d0e6 100644
--- a/src/generic/graphicc.cpp
+++ b/src/generic/graphicc.cpp
@@ -4,7 +4,6 @@
 // Author:      Stefan Csomor
 // Modified by:
 // Created:     2006-10-03
-// RCS-ID:      $Id$
 // Copyright:   (c) 2006 Stefan Csomor
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -1404,7 +1403,7 @@ wxCairoBitmapData::wxCairoBitmapData( wxGraphicsRenderer* renderer, const wxBitm
     // fully transparent or fully opaque
     if (bmpSource.GetMask())
     {
-        wxBitmap bmpMask = bmpSource.GetMaskBitmap();
+        wxBitmap bmpMask = bmpSource.GetMask()->GetBitmap();
         bufferFormat = CAIRO_FORMAT_ARGB32;
         data = (wxUint32*)m_buffer;
         wxNativePixelData
@@ -2516,7 +2515,7 @@ wxGraphicsPen wxCairoRenderer::CreatePen(const wxPen& pen)
 {
     wxGraphicsPen p;
     ENSURE_LOADED_OR_RETURN(p);
-    if (pen.IsOk() && pen.GetStyle() == wxPENSTYLE_TRANSPARENT)
+    if (pen.IsOk() && pen.GetStyle() != wxPENSTYLE_TRANSPARENT)
     {
         p.SetRefData(new wxCairoPenData( this, pen ));
     }
@@ -2527,7 +2526,7 @@ wxGraphicsBrush wxCairoRenderer::CreateBrush(const wxBrush& brush )
 {
     wxGraphicsBrush p;
     ENSURE_LOADED_OR_RETURN(p);
-    if (brush.IsOk() && brush.GetStyle() == wxBRUSHSTYLE_TRANSPARENT)
+    if (brush.IsOk() && brush.GetStyle() != wxBRUSHSTYLE_TRANSPARENT)
     {
         p.SetRefData(new wxCairoBrushData( this, brush ));
     }