X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/5b87170050ae22c8a6351aca9b4bb56f4261f351..0bbe61b8c18a1795189f0cf73cc61c14a0fb846d:/src/common/stattextcmn.cpp?ds=sidebyside diff --git a/src/common/stattextcmn.cpp b/src/common/stattextcmn.cpp index b40340b5c7..f7b6a787dd 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) {