cleanup - reformat; added (disabled) support for secondary highlight color

[wxWidgets.git] / src / mac / carbon / stattext.cpp

diff --git a/src/mac/carbon/stattext.cpp b/src/mac/carbon/stattext.cpp
index f01e11f66652f8a4b79cbacfbb78325dfb8cd1d1..3c67c64a9aae6ef8460ad235395b762ebe13c762 100644 (file)
--- a/src/mac/carbon/stattext.cpp
+++ b/src/mac/carbon/stattext.cpp
@@ -9,12 +9,10 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#pragma implementation "stattext.h"
-#endif
-
 #include "wx/wxprec.h"
 
+#if wxUSE_STATTEXT
+
 #include "wx/app.h"
 #include "wx/stattext.h"
 #include "wx/notebook.h"
@@ -26,9 +24,7 @@
 
 #include <stdio.h>
 
-#if !USE_SHARED_LIBRARY
 IMPLEMENT_DYNAMIC_CLASS(wxStaticText, wxControl)
-#endif
 
 #include "wx/mac/uma.h"
 
@@ -51,7 +47,7 @@ bool wxStaticText::Create(wxWindow *parent, wxWindowID id,
 
     Rect bounds = wxMacGetBoundsForControl( this , pos , size ) ;
     wxMacCFStringHolder str(m_label,m_font.GetEncoding() ) ;
-    m_peer = new wxMacControl() ;
+    m_peer = new wxMacControl(this) ;
     verify_noerr(CreateStaticTextControl(MAC_WXHWND(parent->MacGetTopLevelWindowRef()),&bounds, str , 
         NULL , m_peer->GetControlRefAddr() ) ) ;  
 
@@ -101,7 +97,8 @@ void wxStaticText::SetLabel(const wxString& st )
         SetSize( GetBestSize() ) ;
     }
     Refresh() ;
-    Update() ;
+    // we shouldn't need forced updates
+    // Update() ;
 }
 
 bool wxStaticText::SetFont(const wxFont& font)
@@ -119,3 +116,6 @@ bool wxStaticText::SetFont(const wxFont& font)
 
     return ret;
 }
+
+#endif //if wxUSE_STATTEXT
+