reworked font handling for osx

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@59644 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Stefan Csomor
2009-03-20 13:56:57 +00:00
parent 0cc860a2ab
commit f1c40652a0
19 changed files with 1066 additions and 748 deletions

View File

@@ -57,7 +57,11 @@ 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)
#endif
)
{
// remove markup
wxString str(label);