X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/5b87170050ae22c8a6351aca9b4bb56f4261f351..088441b57cb88b8c04f8a03a7be5a5744aac6187:/src/common/stattextcmn.cpp

diff --git a/src/common/stattextcmn.cpp b/src/common/stattextcmn.cpp
index b40340b5c7..b2ac7a044c 100644
--- a/src/common/stattextcmn.cpp
+++ b/src/common/stattextcmn.cpp
@@ -37,8 +37,6 @@
     #include "wx/containr.h"
 #endif
 
-#if wxUSE_STATTEXT
-
 const wxChar *wxMarkupEntities[][wxMARKUP_ENTITY_MAX] =
 {
     // the entities handled by SetLabel() when wxST_MARKUP is used and their referenced string
@@ -47,6 +45,7 @@ const wxChar *wxMarkupEntities[][wxMARKUP_ENTITY_MAX] =
     { wxT("&"),     wxT("<"),    wxT(">"),    wxT("'"),      wxT("\"")     }
 };
 
+#if wxUSE_STATTEXT
 
 // ----------------------------------------------------------------------------
 // wxTextWrapper
@@ -154,6 +153,14 @@ wxString wxStaticTextBase::GetLabelText() const
     return RemoveMnemonics(ret);
 }
 
+/*static*/
+wxString wxStaticTextBase::GetLabelText(const wxString& label)
+{
+    // remove markup
+    wxString ret = RemoveMarkup(label);
+    return RemoveMnemonics(ret);
+}
+
 /*static*/
 wxString wxStaticTextBase::RemoveMarkup(const wxString& text)
 {
@@ -316,7 +323,7 @@ wxString wxStaticTextBase::Ellipsize(const wxString& label) const
         return label;
     }
 
-    wxClientDC dc(wx_const_cast(wxStaticTextBase*, this));
+    wxClientDC dc(const_cast<wxStaticTextBase*>(this));
     dc.SetFont(GetFont());
 
     wxArrayInt charOffsets;