mouse-capture fix

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

diff --git a/src/mac/carbon/stattext.cpp b/src/mac/carbon/stattext.cpp
index f4757d19d7c223c2b853c4ac0779efdf3f3f55f1..1feace51808572886519aa0dbb7bb8088570daee 100644 (file)
--- a/src/mac/carbon/stattext.cpp
+++ b/src/mac/carbon/stattext.cpp
@@ -9,10 +9,14 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-#ifdef __GNUG__
+#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"
@@ -24,9 +28,7 @@
 
 #include <stdio.h>
 
-#if !USE_SHARED_LIBRARY
 IMPLEMENT_DYNAMIC_CLASS(wxStaticText, wxControl)
-#endif
 
 #include "wx/mac/uma.h"
 
@@ -49,9 +51,9 @@ 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 ) ) ;  
+        NULL , m_peer->GetControlRefAddr() ) ) ;  
 
     MacPostControlCreate(pos,size) ;
 
@@ -61,8 +63,7 @@ bool wxStaticText::Create(wxWindow *parent, wxWindowID id,
 wxSize wxStaticText::DoGetBestSize() const
 {
     ControlFontStyleRec controlFont ;
-    Size outSize ;
-    verify_noerr( GetControlData( *m_peer , kControlEntireControl , kControlFontStyleTag , sizeof(controlFont) , &controlFont , &outSize ) ) ;
+    verify_noerr( m_peer->GetData<ControlFontStyleRec>(kControlEntireControl , kControlFontStyleTag , &controlFont ) ) ;
     
     Point bounds ;
     SInt16 baseline ;
@@ -79,6 +80,9 @@ wxSize wxStaticText::DoGetBestSize() const
     }
     if ( m_label.Length() == 0 )
         bounds.h = 0 ;
+        
+    bounds.h += MacGetLeftBorderSize() + MacGetRightBorderSize() ;
+    bounds.v += MacGetTopBorderSize() + MacGetBottomBorderSize() ;    
     return wxSize(bounds.h, bounds.v);
 }
 
@@ -89,15 +93,14 @@ void wxStaticText::SetLabel(const wxString& st )
     
     wxMacCFStringHolder str(m_label,m_font.GetEncoding() ) ;
     CFStringRef ref = str ;
-    SetControlData( *m_peer, kControlEntireControl , kControlStaticTextCFStringTag, sizeof( CFStringRef ),
-               &ref );
+    verify_noerr( m_peer->SetData<CFStringRef>(kControlEntireControl , kControlStaticTextCFStringTag, ref ) ) ;
 
     if ( !(GetWindowStyle() & wxST_NO_AUTORESIZE) )
     {
+        InvalidateBestSize();
         SetSize( GetBestSize() ) ;
-        SetSizeHints(GetSize());
     }
-
+    Refresh() ;
     Update() ;
 }
 
@@ -108,11 +111,14 @@ bool wxStaticText::SetFont(const wxFont& font)
        if ( ret )
        {
            if ( !(GetWindowStyle() & wxST_NO_AUTORESIZE) )
-            {
-               SetSize( GetBestSize() );
-                SetSizeHints(GetSize());
-            }
+        {
+            InvalidateBestSize();
+            SetSize( GetBestSize() );
+        }
        }
 
     return ret;
 }
+
+#endif //if wxUSE_STATTEXT
+