X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/ba49d2acf95d53517719c4fd9ac2ad5aaa13540b..404b319a85dadd7decf7a5a5331020520031a41c:/src/generic/graphicc.cpp diff --git a/src/generic/graphicc.cpp b/src/generic/graphicc.cpp index 900acd4957..5e7da3dcba 100644 --- a/src/generic/graphicc.cpp +++ b/src/generic/graphicc.cpp @@ -1404,7 +1404,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 +2516,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 +2527,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 )); }