X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/03647350fc7cd141953c72e0284e928847d30f44..a9e41db760792a4e666492d77290f4c51e9c5b19:/src/osx/stattext_osx.cpp?ds=sidebyside

diff --git a/src/osx/stattext_osx.cpp b/src/osx/stattext_osx.cpp
index 1ff9003570..dce98c9b6c 100644
--- a/src/osx/stattext_osx.cpp
+++ b/src/osx/stattext_osx.cpp
@@ -4,7 +4,7 @@
 // Author:      Stefan Csomor
 // Modified by:
 // Created:     04/01/98
-// RCS-ID:      $Id: stattext.cpp 54845 2008-07-30 14:52:41Z SC $
+// RCS-ID:      $Id$
 // Copyright:   (c) Stefan Csomor
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -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() );
 }