keeping opaqueness and backgroundcolor in synch with bgstyle

[wxWidgets.git] / src / osx / stattext_osx.cpp

diff --git a/src/osx/stattext_osx.cpp b/src/osx/stattext_osx.cpp
index 6cf8127b4ee69d0efca1bfafb7dc5bb34fb663f0..94af706ee6b4499c5441bcb1ef87f9f8212cebc1 100644 (file)
--- a/src/osx/stattext_osx.cpp
+++ b/src/osx/stattext_osx.cpp
@@ -1,10 +1,10 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        src/mac/carbon/stattext.cpp
+// Name:        src/osx/carbon/stattext.cpp

 // Purpose:     wxStaticText
 // Author:      Stefan Csomor
 // Modified by:
 // Created:     04/01/98
 // Purpose:     wxStaticText
 // Author:      Stefan Csomor
 // Modified by:
 // Created:     04/01/98

-// RCS-ID:      $Id: stattext.cpp 54845 2008-07-30 14:52:41Z SC $
+// RCS-ID:      $Id$

 // Copyright:   (c) Stefan Csomor
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 // Copyright:   (c) Stefan Csomor
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////


@@ -23,15 +23,10 @@
     #include "wx/settings.h"
 #endif // WX_PRECOMP
 
     #include "wx/settings.h"
 #endif // WX_PRECOMP
 

-#include "wx/notebook.h"
-#include "wx/tabctrl.h"
-

 #include "wx/osx/private.h"
 
 #include <stdio.h>
 
 #include "wx/osx/private.h"
 
 #include <stdio.h>
 

-IMPLEMENT_DYNAMIC_CLASS(wxStaticText, wxControl)
-

 
 bool wxStaticText::Create( wxWindow *parent,
     wxWindowID id,
 
 bool wxStaticText::Create( wxWindow *parent,
     wxWindowID id,


@@ -60,15 +55,14 @@ void wxStaticText::SetLabel(const wxString& label)
     m_labelOrig = label;
 
     // middle/end ellipsization is handled by the OS:
     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);
-        if (HasFlag(wxST_MARKUP))
-            str = RemoveMarkup(label);
-
-        // and leave ellipsization to the OS
-        DoSetLabel(str);
+        // leave ellipsization to the OS
+        DoSetLabel(GetLabelWithoutMarkup());

     }
     else // not supported natively
     {
     }
     else // not supported natively
     {


@@ -106,7 +100,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_peer->SetLabel(m_label , GetFont().GetEncoding() );
 }
     m_label = RemoveMnemonics(label);
     m_peer->SetLabel(m_label , GetFont().GetEncoding() );
 }