From: Stefan Csomor <csomor@advancedconcepts.ch>
Date: Fri, 2 Apr 2010 18:19:03 +0000 (+0000)
Subject: keeping m_labelOrig untouched, solves test failures (FM)
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/2318a5d74c0beef21790adbbc6ff496224eb35cc?ds=inline

keeping m_labelOrig untouched, solves test failures (FM)

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@63829 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---

diff --git a/src/osx/stattext_osx.cpp b/src/osx/stattext_osx.cpp
index 1ff9003570..79223b46b8 100644
--- a/src/osx/stattext_osx.cpp
+++ b/src/osx/stattext_osx.cpp
@@ -63,13 +63,8 @@ void wxStaticText::SetLabel(const wxString& label)
 #endif
     )
     {
-        // remove markup
-        wxString str(label);
-        if (HasFlag(wxST_MARKUP))
-            str = RemoveMarkup(label);
-
-        // and leave ellipsization to the OS
-        DoSetLabel(str);
+        // leave ellipsization to the OS
+        DoSetLabel(GetLabelWithoutMarkup());
     }
     else // not supported natively
     {
@@ -107,7 +102,6 @@ bool wxStaticText::SetFont(const wxFont& font)
 
 void wxStaticText::DoSetLabel(const wxString& label)
 {
-    m_labelOrig = label;
     m_label = RemoveMnemonics(label);
     m_peer->SetLabel(m_label , GetFont().GetEncoding() );
 }