avoid setting initial position if it was not specified, broken in r70734

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

diff --git a/src/osx/carbon/stattext.cpp b/src/osx/carbon/stattext.cpp
index e51b2af2b1167da54ebaf032e043393247f5ffbf..8b0c9714c47b5ed9261e7da5685a84ff0f0d0e34 100644 (file)
--- a/src/osx/carbon/stattext.cpp
+++ b/src/osx/carbon/stattext.cpp
@@ -4,7 +4,6 @@
 // Author:      Stefan Csomor
 // Modified by:
 // Created:     04/01/98
-// RCS-ID:      $Id$
 // Copyright:   (c) Stefan Csomor
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -48,10 +47,11 @@ wxSize wxStaticText::DoGetBestSize() const
     Rect bestsize = { 0 , 0 , 0 , 0 } ;
 
     // try the built-in best size if available
-    Boolean former = m_peer->GetData<Boolean>( kControlStaticTextIsMultilineTag);
-    m_peer->SetData( kControlStaticTextIsMultilineTag, (Boolean)0 );
-    m_peer->GetBestRect( &bestsize ) ;
-    m_peer->SetData( kControlStaticTextIsMultilineTag, former );
+    Boolean former = GetPeer()->GetData<Boolean>( kControlStaticTextIsMultilineTag);
+    GetPeer()->SetData( kControlStaticTextIsMultilineTag, (Boolean)0 );
+    GetPeer()->GetBestRect( &bestsize ) ;
+    GetPeer()->SetData( kControlStaticTextIsMultilineTag, former );
+    
     if ( !EmptyRect( &bestsize ) )
     {
         bounds.h = bestsize.right - bestsize.left ;
@@ -62,22 +62,22 @@ wxSize wxStaticText::DoGetBestSize() const
     {
 #if wxOSX_USE_CARBON
         ControlFontStyleRec controlFont;
-        OSStatus err = m_peer->GetData<ControlFontStyleRec>( kControlEntireControl, kControlFontStyleTag, &controlFont );
+        OSStatus err = GetPeer()->GetData<ControlFontStyleRec>( kControlEntireControl, kControlFontStyleTag, &controlFont );
         verify_noerr( err );
 
 #if wxOSX_USE_ATSU_TEXT
         SInt16 baseline;
         if ( m_font.MacGetThemeFontID() != kThemeCurrentPortFont )
         {
-            // GetThemeTextDimensions will cache strings and the documentation 
-            // says not to use the NoCopy string creation calls. 
-            // This also means that we can't use CFSTR without 
-            // -fno-constant-cfstrings if the library might be unloaded, 
-            // as GetThemeTextDimensions may cache a pointer to our 
-            // unloaded segment. 
-            wxCFStringRef str( !m_label.empty() ? m_label : wxString(" "), 
+            // GetThemeTextDimensions will cache strings and the documentation
+            // says not to use the NoCopy string creation calls.
+            // This also means that we can't use CFSTR without
+            // -fno-constant-cfstrings if the library might be unloaded,
+            // as GetThemeTextDimensions may cache a pointer to our
+            // unloaded segment.
+            wxCFStringRef str( !m_label.empty() ? m_label : wxString(" "),
                               GetFont().GetEncoding() );
-            
+
             err = GetThemeTextDimensions(
                 (CFStringRef)str,
                 m_font.MacGetThemeFontID(), kThemeStateActive, false, &bounds, &baseline );