implemented correct setting of background colour for text
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@394 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -322,10 +322,23 @@ wxLayoutList::Draw(wxDC &dc, bool findObject, wxPoint const &findCoords)
|
||||
|
||||
// setting up the default:
|
||||
dc.SetTextForeground( *wxBLACK );
|
||||
dc.SetTextBackground( *wxWHITE );
|
||||
dc.SetBackgroundMode( wxSOLID ); // to enable setting of text background
|
||||
dc.SetFont( *wxNORMAL_FONT );
|
||||
|
||||
|
||||
//FIXME: who frees the brush, how long does it need to exist?
|
||||
if(m_DefaultSetting)
|
||||
{
|
||||
m_DefaultSetting->Draw(dc,wxPoint(0,0),0,true);
|
||||
dc.SetBackground( wxBrush(* m_DefaultSetting->GetBGColour(),wxSOLID));
|
||||
}
|
||||
else
|
||||
dc.SetBackground( wxBrush(wxColour("White"), wxSOLID) );
|
||||
|
||||
dc.Clear();
|
||||
|
||||
|
||||
|
||||
// we calculate everything for drawing a line, then rewind to the
|
||||
// begin of line and actually draw it
|
||||
@@ -850,6 +863,7 @@ wxLayoutList::Clear(int family, int size, int style, int weight,
|
||||
m_LineHeight = (BASELINESTRETCH*m_FontPtSize)/10;
|
||||
m_MaxX = 0; m_MaxY = 0;
|
||||
|
||||
|
||||
if(m_DefaultSetting)
|
||||
delete m_DefaultSetting;
|
||||
m_DefaultSetting = new
|
||||
|
Reference in New Issue
Block a user