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

wxGTK1 : change type of wxMask.GetBitmap() from GdkBitmap* to wxBitmap

Browse Source
This commit is contained in:
Jouk
2019-12-19 09:20:36 +01:00
parent c06e50f389
commit d90953d8c6
10 changed files with 39 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/gtk1/dcclient.cpp
View File

@@ -1042,7 +1042,7 @@ void wxWindowDCImpl::DoDrawBitmap( const wxBitmap &bitmap,
// apply mask if any
GdkBitmap *mask = NULL;
if (use_bitmap.GetMask()) mask = use_bitmap.GetMask()->GetBitmap();
if (use_bitmap.GetMask()) mask = use_bitmap.GetMask()->m_bitmap;
GdkBitmap *new_mask = NULL;
@@ -1265,7 +1265,7 @@ bool wxWindowDCImpl::DoBlit( wxCoord xdest, wxCoord ydest,
// apply mask if any
GdkBitmap *mask = NULL;
if (use_bitmap.GetMask()) mask = use_bitmap.GetMask()->GetBitmap();
if (use_bitmap.GetMask()) mask = use_bitmap.GetMask()->m_bitmap;
GdkBitmap *new_mask = NULL;
@@ -1823,7 +1823,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()->m_bitmap );
}
if (m_brush.IsHatch())