private dataformat almost working - minor fixes

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@4583 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Karsten Ballüder
1999-11-15 21:15:25 +00:00
parent f49f2b0c33
commit 329e50732b
3 changed files with 54 additions and 48 deletions

View File

@@ -1568,6 +1568,18 @@ wxLayoutList::InternalClear(void)
m_CursorStyleInfo = m_DefaultStyleInfo;
}
void
wxLayoutList::Read(wxString &istr)
{
while(istr.Length())
{
wxLayoutObject *obj = wxLayoutObject::Read(istr);
if(obj)
Insert(obj);
}
}
void
wxLayoutList::SetFont(int family, int size, int style, int weight,
int underline, wxColour *fg,
@@ -2352,15 +2364,10 @@ wxLayoutList::Draw(wxDC &dc,
}
InvalidateUpdateRect();
#ifdef DEBUG
if ( m_Selection.m_valid )
{
WXLO_DEBUG(("Selection is %s : %ld,%ld/%ld,%ld",
m_Selection.m_valid ? "valid" : "invalid",
m_Selection.m_CursorA.x, m_Selection.m_CursorA.y,
m_Selection.m_CursorB.x, m_Selection.m_CursorB.y));
}
#endif
WXLO_DEBUG(("Selection is %s : l%d,%ld/%ld,%ld",
m_Selection.m_valid ? "valid" : "invalid",
m_Selection.m_CursorA.x, m_Selection.m_CursorA.y,
m_Selection.m_CursorB.x, m_Selection.m_CursorB.y));
}
wxLayoutObject *
@@ -2860,7 +2867,6 @@ wxLayoutList::GetSelection(wxLayoutDataObject *wxlo, bool invalidate)
exp->content.object->Write(string);
delete exp;
}
wxlo->SetLayoutData(string);
}
return llist;