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

diff --git a/contrib/src/ogl/basic.cpp b/contrib/src/ogl/basic.cpp
index 16e198b1e239f7aa71b9b914516b08650a67779b..63bbc4dfee26b0dea6a398c9dd034b8ba0c670d9 100644 (file)
--- a/contrib/src/ogl/basic.cpp
+++ b/contrib/src/ogl/basic.cpp
@@ -601,7 +601,8 @@ void wxShape::FormatText(wxDC& dc, const wxString& s, int i)
     return;
 
   wxShapeRegion *region = (wxShapeRegion *)node->Data();
     return;
 
   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());
 
   region->GetSize(&w, &h);
   dc.SetFont(* region->GetFont());
 
   region->GetSize(&w, &h);