Updated, fixed a colour bug.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@2459 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Karsten Ballüder 1999-05-14 10:31:21 +00:00
parent b86cda55e5
commit 830cd6f489

View File

@ -749,7 +749,9 @@ wxLayoutLine::Draw(wxDC &dc,
CoordType xpos = 0; // cursorpos, lenght of line CoordType xpos = 0; // cursorpos, lenght of line
CoordType from, to, tempto; CoordType from, to, tempto;
llist->ApplyStyle(&((wxLayoutLine *)this)->m_StyleInfo, dc); //FIXME This doesn't work yet, needs updating afterr default
//settings for list or a wxLayoutObjectCmd have changed:
//llist->ApplyStyle(&((wxLayoutLine *)this)->m_StyleInfo, dc);
int highlight = llist->IsSelected(this, &from, &to); int highlight = llist->IsSelected(this, &from, &to);
// WXLO_DEBUG(("highlight=%d", highlight )); // WXLO_DEBUG(("highlight=%d", highlight ));
if(highlight == 1) // we need to draw the whole line inverted! if(highlight == 1) // we need to draw the whole line inverted!
@ -817,7 +819,9 @@ wxLayoutLine::Layout(wxDC &dc,
if(cursorSize) *cursorSize = wxPoint(0,0); if(cursorSize) *cursorSize = wxPoint(0,0);
} }
llist->ApplyStyle(&m_StyleInfo, dc); //FIXME This doesn't work yet, needs updating afterr default
//settings for list or a wxLayoutObjectCmd have changed:
//llist->ApplyStyle(&m_StyleInfo, dc);
for(i = m_ObjectList.begin(); i != NULLIT; i++) for(i = m_ObjectList.begin(); i != NULLIT; i++)
{ {
(**i).Layout(dc, llist); (**i).Layout(dc, llist);
@ -1544,9 +1548,7 @@ wxLayoutList::Layout(wxDC &dc, CoordType bottom, bool forceAll)
// first, make sure everything is calculated - this might not be // first, make sure everything is calculated - this might not be
// needed, optimise it later // needed, optimise it later
//FIXME This doesn't work yet, needs updating afterr default ApplyStyle(&m_DefaultSetting, dc);
//settings for list or a wxLayoutObjectCmd have changed:
// ApplyStyle(&m_DefaultSetting, dc);
while(line) while(line)
{ {
if(forceAll || line->IsDirty()) if(forceAll || line->IsDirty())