wxPalmOS build fix.

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

diff --git a/src/mac/carbon/stattext.cpp b/src/mac/carbon/stattext.cpp
index 1feace51808572886519aa0dbb7bb8088570daee..0884349c13e73dbca889b3267e6b18325533cbaf 100644 (file)
--- a/src/mac/carbon/stattext.cpp
+++ b/src/mac/carbon/stattext.cpp
@@ -9,10 +9,6 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#pragma implementation "stattext.h"
-#endif
-
 #include "wx/wxprec.h"
 
 #if wxUSE_STATTEXT
@@ -26,96 +22,114 @@
 #include "wx/utils.h"
 #include "wx/settings.h"
 
+#include "wx/mac/uma.h"
+
 #include <stdio.h>
 
 IMPLEMENT_DYNAMIC_CLASS(wxStaticText, wxControl)
 
-#include "wx/mac/uma.h"
 
-bool wxStaticText::Create(wxWindow *parent, wxWindowID id,
-           const wxString& label,
-           const wxPoint& pos,
-           const wxSize& size,
-           long style,
-           const wxString& name)
+bool wxStaticText::Create( wxWindow *parent,
+    wxWindowID id,
+    const wxString& label,
+    const wxPoint& pos,
+    const wxSize& size,
+    long style,
+    const wxString& name )
 {
-    m_macIsUserPane = FALSE ;
-    
-    m_label = wxStripMenuCodes(label) ;
+    m_macIsUserPane = false;
 
-    if ( !wxControl::Create( parent, id, pos, size, style,
-                             wxDefaultValidator , name ) )
-    {
+    m_label = wxStripMenuCodes( label );
+
+    if ( !wxControl::Create( parent, id, pos, size, style, wxDefaultValidator, name ) )
         return false;
-    }
 
-    Rect bounds = wxMacGetBoundsForControl( this , pos , size ) ;
-    wxMacCFStringHolder str(m_label,m_font.GetEncoding() ) ;
-    m_peer = new wxMacControl(this) ;
-    verify_noerr(CreateStaticTextControl(MAC_WXHWND(parent->MacGetTopLevelWindowRef()),&bounds, str , 
-        NULL , m_peer->GetControlRefAddr() ) ) ;  
+    Rect bounds = wxMacGetBoundsForControl( this, pos, size );
+    wxMacCFStringHolder str( m_label, m_font.GetEncoding() );
+
+    m_peer = new wxMacControl( this );
+    OSStatus err = CreateStaticTextControl(
+        MAC_WXHWND(parent->MacGetTopLevelWindowRef()),
+        &bounds, str, NULL, m_peer->GetControlRefAddr() );
+    verify_noerr( err );
 
-    MacPostControlCreate(pos,size) ;
+    MacPostControlCreate( pos, size );
 
     return true;
 }
 
 wxSize wxStaticText::DoGetBestSize() const
 {
-    ControlFontStyleRec controlFont ;
-    verify_noerr( m_peer->GetData<ControlFontStyleRec>(kControlEntireControl , kControlFontStyleTag , &controlFont ) ) ;
-    
-    Point bounds ;
-    SInt16 baseline ;
-    wxMacCFStringHolder str(m_label ,  m_font.GetEncoding() ) ;
+    ControlFontStyleRec controlFont;
+    OSStatus err = m_peer->GetData<ControlFontStyleRec>( kControlEntireControl, kControlFontStyleTag, &controlFont );
+    verify_noerr( err );
+
+    Point bounds;
+    SInt16 baseline;
+    wxMacCFStringHolder str( m_label,  m_font.GetEncoding() );
+
     if ( m_font.MacGetThemeFontID() != kThemeCurrentPortFont )
-        verify_noerr( GetThemeTextDimensions( (m_label.Length() > 0 ? ((CFStringRef) str ) : CFSTR(" ") ) , m_font.MacGetThemeFontID() , kThemeStateActive , false , &bounds , &baseline ) ) ;
+    {
+        err = GetThemeTextDimensions(
+            (m_label.Length() > 0 ? (CFStringRef)str : CFSTR(" ")),
+            m_font.MacGetThemeFontID(), kThemeStateActive, false, &bounds, &baseline );
+        verify_noerr( err );
+    }
     else
     {
-        wxMacWindowStateSaver sv( this ) ;
-        ::TextFont( m_font.MacGetFontNum() ) ;
-        ::TextSize( (short)( m_font.MacGetFontSize()) ) ;
-        ::TextFace( m_font.MacGetFontStyle() ) ;        
-        verify_noerr( GetThemeTextDimensions( (m_label.Length() > 0 ? ((CFStringRef) str ) : CFSTR(" ") ) , kThemeCurrentPortFont , kThemeStateActive , false , &bounds , &baseline ) ) ;
+        wxMacWindowStateSaver sv( this );
+        ::TextFont( m_font.MacGetFontNum() );
+        ::TextSize( (short)(m_font.MacGetFontSize()) );
+        ::TextFace( m_font.MacGetFontStyle() );
+
+        err = GetThemeTextDimensions(
+            (m_label.Length() > 0 ? (CFStringRef)str : CFSTR(" ")),
+            kThemeCurrentPortFont, kThemeStateActive, false, &bounds, &baseline );
+        verify_noerr( err );
     }
+
     if ( m_label.Length() == 0 )
         bounds.h = 0 ;
-        
-    bounds.h += MacGetLeftBorderSize() + MacGetRightBorderSize() ;
-    bounds.v += MacGetTopBorderSize() + MacGetBottomBorderSize() ;    
-    return wxSize(bounds.h, bounds.v);
+
+    bounds.h += MacGetLeftBorderSize() + MacGetRightBorderSize();
+    bounds.v += MacGetTopBorderSize() + MacGetBottomBorderSize();
+
+    return wxSize( bounds.h, bounds.v );
 }
 
-void wxStaticText::SetLabel(const wxString& st )
+void wxStaticText::SetLabel( const wxString& st )
 {
+    m_label = wxStripMenuCodes( st );
 
-    m_label = wxStripMenuCodes(st) ;
-    
-    wxMacCFStringHolder str(m_label,m_font.GetEncoding() ) ;
-    CFStringRef ref = str ;
-    verify_noerr( m_peer->SetData<CFStringRef>(kControlEntireControl , kControlStaticTextCFStringTag, ref ) ) ;
+    wxMacCFStringHolder str( m_label, m_font.GetEncoding() );
+    CFStringRef ref = str;
+    OSStatus err = m_peer->SetData<CFStringRef>(kControlEntireControl, kControlStaticTextCFStringTag, ref );
+    verify_noerr( err );
 
     if ( !(GetWindowStyle() & wxST_NO_AUTORESIZE) )
     {
         InvalidateBestSize();
-        SetSize( GetBestSize() ) ;
+        SetSize( GetBestSize() );
     }
-    Refresh() ;
-    Update() ;
+
+    Refresh();
+
+    // we shouldn't need forced updates
+    // Update() ;
 }
 
 bool wxStaticText::SetFont(const wxFont& font)
 {
-    bool ret = wxControl::SetFont(font);
+    bool ret = wxControl::SetFont( font );
 
-       if ( ret )
-       {
-           if ( !(GetWindowStyle() & wxST_NO_AUTORESIZE) )
+    if ( ret )
+    {
+        if ( !(GetWindowStyle() & wxST_NO_AUTORESIZE) )
         {
             InvalidateBestSize();
             SetSize( GetBestSize() );
         }
-       }
+    }
 
     return ret;
 }