Include wx/icon.h according to precompiled headers of wx/wx.h (with other minor clean...

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

diff --git a/src/mac/carbon/stattext.cpp b/src/mac/carbon/stattext.cpp
index 024cc6eed7034085b34d5bac6fb7093c7235cbc0..1aea449abc2eea13e80dee149cd4c8b2c606f0b9 100644 (file)
--- a/src/mac/carbon/stattext.cpp
+++ b/src/mac/carbon/stattext.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

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

 // Purpose:     wxStaticText
 // Author:      Stefan Csomor
 // Modified by:
 // Purpose:     wxStaticText
 // Author:      Stefan Csomor
 // Modified by:


@@ -9,110 +9,143 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 

-#ifdef __GNUG__
-#pragma implementation "stattext.h"
-#endif
+#include "wx/wxprec.h"
+
+#if wxUSE_STATTEXT

 
 

-#include "wx/app.h"

 #include "wx/stattext.h"
 #include "wx/stattext.h"

+
+#ifndef WX_PRECOMP
+    #include "wx/app.h"
+    #include "wx/utils.h"
+    #include "wx/dc.h"
+    #include "wx/dcclient.h"
+#endif // WX_PRECOMP
+

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

-#include "wx/dc.h"
-#include "wx/dcclient.h"
-#include "wx/utils.h"

 #include "wx/settings.h"
 
 #include "wx/settings.h"
 

+#include "wx/mac/uma.h"
+

 #include <stdio.h>
 
 #include <stdio.h>
 

-#if !USE_SHARED_LIBRARY

 IMPLEMENT_DYNAMIC_CLASS(wxStaticText, wxControl)
 IMPLEMENT_DYNAMIC_CLASS(wxStaticText, wxControl)

-#endif

 
 

-#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;
         return false;

-    }

 
 

-    Rect bounds = wxMacGetBoundsForControl( this , pos , size ) ;
-    wxMacCFStringHolder str(m_label,m_font.GetEncoding() ) ;
-    m_peer = new wxMacControl() ;
-    verify_noerr(CreateStaticTextControl(MAC_WXHWND(parent->MacGetTopLevelWindowRef()),&bounds, str , 
-        NULL , *m_peer ) ) ;  
+    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) ;
+    if ( ( style & wxST_DOTS_END ) || ( style & wxST_DOTS_MIDDLE ) )
+    {
+        TruncCode tCode = truncEnd;
+        if ( style & wxST_DOTS_MIDDLE )
+            tCode = truncMiddle;
+
+        err = m_peer->SetData( kControlStaticTextTruncTag, tCode );
+        err = m_peer->SetData( kControlStaticTextIsMultilineTag, (Boolean)0 );
+    }
+
+    MacPostControlCreate( pos, size );

 
     return true;
 }
 
 wxSize wxStaticText::DoGetBestSize() const
 {
 
     return true;
 }
 
 wxSize wxStaticText::DoGetBestSize() const
 {

-    ControlFontStyleRec controlFont ;
-    Size outSize ;
-    verify_noerr( GetControlData( *m_peer , kControlEntireControl , kControlFontStyleTag , sizeof(controlFont) , &controlFont , &outSize ) ) ;
-    
-    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 )
     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.empty() ? (CFStringRef)str : CFSTR(" ")),
+            m_font.MacGetThemeFontID(), kThemeStateActive, false, &bounds, &baseline );
+        verify_noerr( err );
+    }

     else
     {
     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.empty() ? (CFStringRef)str : CFSTR(" ")),
+            kThemeCurrentPortFont, kThemeStateActive, false, &bounds, &baseline );
+        verify_noerr( err );

     }
     }

-    if ( m_label.Length() == 0 )
-        bounds.h = 0 ;
-    return wxSize(bounds.h, bounds.v);
+
+    if ( m_label.empty() )
+        bounds.h = 0;
+
+    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 ;
-    SetControlData( *m_peer, kControlEntireControl , kControlStaticTextCFStringTag, sizeof( CFStringRef ),
-               &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();
 
     if ( !(GetWindowStyle() & wxST_NO_AUTORESIZE) )
     {
         InvalidateBestSize();

-        SetSize( GetBestSize() ) ;
+        SetSize( GetBestSize() );

     }
 
     }
 

-    Update() ;
+    Refresh();
+
+    // we shouldn't need forced updates
+    // Update();

 }
 
 bool wxStaticText::SetFont(const wxFont& font)
 {
 }
 
 bool wxStaticText::SetFont(const wxFont& font)
 {

-    bool ret = wxControl::SetFont(font);
+    bool ret = wxControl::SetFont( font );

 
 

-       if ( ret )
-       {
-           if ( !(GetWindowStyle() & wxST_NO_AUTORESIZE) )
-            {
-                InvalidateBestSize();
-               SetSize( GetBestSize() );
-            }
-       }
+    if ( ret )
+    {
+        if ( !(GetWindowStyle() & wxST_NO_AUTORESIZE) )
+        {
+            InvalidateBestSize();
+            SetSize( GetBestSize() );
+        }
+    }

 
     return ret;
 }
 
     return ret;
 }

+
+#endif //if wxUSE_STATTEXT