Applied Russel's changes to wxToolBarBase

fixed stippled brush for bitmaps (as opposed to pixmaps)


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@1702 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robert Roebling
1999-02-16 09:31:28 +00:00
parent 84c188148d
commit 4fcd73bd9b
10 changed files with 59 additions and 145 deletions

View File

@@ -971,9 +971,12 @@ void wxWindowDC::SetBrush( const wxBrush &brush )
gdk_gc_set_fill( m_brushGC, fillStyle );
if (m_brush.GetStyle() == wxSTIPPLE)
if ((m_brush.GetStyle() == wxSTIPPLE) && (m_brush.GetStipple()->Ok()))
{
gdk_gc_set_stipple( m_brushGC, m_brush.GetStipple()->GetPixmap() );
if (m_brush.GetStipple()->GetPixmap())
gdk_gc_set_stipple( m_brushGC, m_brush.GetStipple()->GetPixmap() );
else
gdk_gc_set_stipple( m_brushGC, m_brush.GetStipple()->GetBitmap() );
}
if (IS_HATCH(m_brush.GetStyle()))