Fixed problem of FormatText causing both the formatted and unformatted
text to be displayed git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18466 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -601,7 +601,8 @@ void wxShape::FormatText(wxDC& dc, const wxString& s, int i)
|
|||||||
return;
|
return;
|
||||||
|
|
||||||
wxShapeRegion *region = (wxShapeRegion *)node->Data();
|
wxShapeRegion *region = (wxShapeRegion *)node->Data();
|
||||||
region->SetText(s);
|
// region->SetText(s); // don't set the formatted text yet, it will be done below
|
||||||
|
region->m_regionText = s;
|
||||||
dc.SetFont(* region->GetFont());
|
dc.SetFont(* region->GetFont());
|
||||||
|
|
||||||
region->GetSize(&w, &h);
|
region->GetSize(&w, &h);
|
||||||
|
Reference in New Issue
Block a user