Renamed wxStream::StreamSize() to wxStream::GetSize()
Add wxStream bool operator !(). Made wxTextStream safe for conversion from/to Mac/DOS/Unix Added wxFrame::Iconize() Applied patch for stippled brushes. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@3117 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -1010,7 +1010,7 @@ void wxWindowDC::SetBrush( const wxBrush &brush )
|
||||
if ((m_brush.GetStyle() == wxSTIPPLE) && (m_brush.GetStipple()->Ok()))
|
||||
{
|
||||
if (m_brush.GetStipple()->GetPixmap())
|
||||
gdk_gc_set_stipple( m_brushGC, m_brush.GetStipple()->GetPixmap() );
|
||||
gdk_gc_set_tile( m_brushGC, m_brush.GetStipple()->GetPixmap() );
|
||||
else
|
||||
gdk_gc_set_stipple( m_brushGC, m_brush.GetStipple()->GetBitmap() );
|
||||
}
|
||||
@@ -1055,9 +1055,12 @@ void wxWindowDC::SetBackground( const wxBrush &brush )
|
||||
|
||||
gdk_gc_set_fill( m_bgGC, fillStyle );
|
||||
|
||||
if (m_backgroundBrush.GetStyle() == wxSTIPPLE)
|
||||
if ((m_backgroundBrush.GetStyle() == wxSTIPPLE) && (m_backgroundBrush.GetStipple()->Ok()))
|
||||
{
|
||||
gdk_gc_set_stipple( m_bgGC, m_backgroundBrush.GetStipple()->GetPixmap() );
|
||||
if (m_brush.GetStipple()->GetPixmap())
|
||||
gdk_gc_set_tile( m_bgGC, m_brush.GetStipple()->GetPixmap() );
|
||||
else
|
||||
gdk_gc_set_stipple( m_bgGC, m_brush.GetStipple()->GetBitmap() );
|
||||
}
|
||||
|
||||
if (IS_HATCH(m_backgroundBrush.GetStyle()))
|
||||
|
Reference in New Issue
Block a user