freeze whole window for TLW

[wxWidgets.git] / src / osx / stattext_osx.cpp

diff --git a/src/osx/stattext_osx.cpp b/src/osx/stattext_osx.cpp
index 30b871a442b8725bba01d2680e3aa5a0b1f7e1d6..79223b46b80e415b26e9037797b002b5c851e49f 100644 (file)
--- a/src/osx/stattext_osx.cpp
+++ b/src/osx/stattext_osx.cpp
@@ -57,19 +57,14 @@ void wxStaticText::SetLabel(const wxString& label)
     m_labelOrig = label;
 
     // middle/end ellipsization is handled by the OS:
-    if ( HasFlag(wxST_ELLIPSIZE_END) || HasFlag(wxST_ELLIPSIZE_MIDDLE) 
+    if ( HasFlag(wxST_ELLIPSIZE_END) || HasFlag(wxST_ELLIPSIZE_MIDDLE)
 #if wxOSX_USE_COCOA // Cocoa has all three modes
-         || HasFlag(wxST_ELLIPSIZE_START) 
+         || HasFlag(wxST_ELLIPSIZE_START)
 #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() );
 }