Amebis/wxWidgets
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

add wxMask::GetBitmap(), closes #9381

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@73409 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Paul Cornett
2013-01-20 06:28:11 +00:00
parent 3e118784c7
commit 5ca21fe7bf
13 changed files with 95 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/gtk/dcclient.cpp
View File

@@ -1130,7 +1130,7 @@ void wxWindowDCImpl::DoDrawBitmap( const wxBitmap &bitmap,
{
wxMask* m = bitmap.GetMask();
if (m)
mask = m->GetBitmap();
mask = *m;
}
if (mask)
{
@@ -1228,7 +1228,7 @@ bool wxWindowDCImpl::DoBlit( wxCoord xdest, wxCoord ydest,
{
wxMask* m = bitmap.GetMask();
if (m)
mask = m->GetBitmap();
mask = *m;
}
}
else
@@ -1796,7 +1796,7 @@ void wxWindowDCImpl::SetBrush( const wxBrush &brush )
if ((m_brush.GetStyle() == wxBRUSHSTYLE_STIPPLE_MASK_OPAQUE) && (m_brush.GetStipple()->GetMask()))
{
gdk_gc_set_fill( m_textGC, GDK_OPAQUE_STIPPLED);
gdk_gc_set_stipple( m_textGC, m_brush.GetStipple()->GetMask()->GetBitmap() );
gdk_gc_set_stipple( m_textGC, *m_brush.GetStipple()->GetMask() );
}
if (m_brush.IsHatch())