X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/e53b3d16de127872e39bf276f7e616b32f161645..6604fd4c23f2a4f392d460ae2d07efd6db359234:/src/osx/stattext_osx.cpp?ds=sidebyside diff --git a/src/osx/stattext_osx.cpp b/src/osx/stattext_osx.cpp index 6cf8127b4e..1ff9003570 100644 --- a/src/osx/stattext_osx.cpp +++ b/src/osx/stattext_osx.cpp @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: src/mac/carbon/stattext.cpp +// Name: src/osx/carbon/stattext.cpp // Purpose: wxStaticText // Author: Stefan Csomor // Modified by: @@ -23,9 +23,6 @@ #include "wx/settings.h" #endif // WX_PRECOMP -#include "wx/notebook.h" -#include "wx/tabctrl.h" - #include "wx/osx/private.h" #include @@ -60,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);