Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

keeping m_labelOrig untouched, solves test failures (FM)

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@63829 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Stefan Csomor
2010-04-02 18:19:03 +00:00
parent 62068535c5
commit 2318a5d74c
1 changed files with 2 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/osx/stattext_osx.cpp
View File

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