Added resize support to wxMiniFrame.

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

diff --git a/src/mac/carbon/stattext.cpp b/src/mac/carbon/stattext.cpp
index 0884349c13e73dbca889b3267e6b18325533cbaf..0898022392ba27b2f0a050d48d7d625806d71e13 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:


@@ -13,14 +13,18 @@
 
 #if wxUSE_STATTEXT
 
 
 #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"
+    #include "wx/settings.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/mac/uma.h"
 
 
 #include "wx/mac/uma.h"
 


@@ -39,7 +43,7 @@ bool wxStaticText::Create( wxWindow *parent,
 {
     m_macIsUserPane = false;
 
 {
     m_macIsUserPane = false;
 

-    m_label = wxStripMenuCodes( label );
+    m_label = GetLabelText( label );

 
     if ( !wxControl::Create( parent, id, pos, size, style, wxDefaultValidator, name ) )
         return false;
 
     if ( !wxControl::Create( parent, id, pos, size, style, wxDefaultValidator, name ) )
         return false;


@@ -53,6 +57,16 @@ bool wxStaticText::Create( wxWindow *parent,
         &bounds, str, NULL, m_peer->GetControlRefAddr() );
     verify_noerr( err );
 
         &bounds, str, NULL, m_peer->GetControlRefAddr() );
     verify_noerr( err );
 

+    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;
     MacPostControlCreate( pos, size );
 
     return true;


@@ -71,7 +85,7 @@ wxSize wxStaticText::DoGetBestSize() const
     if ( m_font.MacGetThemeFontID() != kThemeCurrentPortFont )
     {
         err = GetThemeTextDimensions(
     if ( m_font.MacGetThemeFontID() != kThemeCurrentPortFont )
     {
         err = GetThemeTextDimensions(

-            (m_label.Length() > 0 ? (CFStringRef)str : CFSTR(" ")),
+            (!m_label.empty() ? (CFStringRef)str : CFSTR(" ")),

             m_font.MacGetThemeFontID(), kThemeStateActive, false, &bounds, &baseline );
         verify_noerr( err );
     }
             m_font.MacGetThemeFontID(), kThemeStateActive, false, &bounds, &baseline );
         verify_noerr( err );
     }


@@ -83,13 +97,13 @@ wxSize wxStaticText::DoGetBestSize() const
         ::TextFace( m_font.MacGetFontStyle() );
 
         err = GetThemeTextDimensions(
         ::TextFace( m_font.MacGetFontStyle() );
 
         err = GetThemeTextDimensions(

-            (m_label.Length() > 0 ? (CFStringRef)str : CFSTR(" ")),
+            (!m_label.empty() ? (CFStringRef)str : CFSTR(" ")),

             kThemeCurrentPortFont, kThemeStateActive, false, &bounds, &baseline );
         verify_noerr( err );
     }
 
             kThemeCurrentPortFont, kThemeStateActive, false, &bounds, &baseline );
         verify_noerr( err );
     }
 

-    if ( m_label.Length() == 0 )
-        bounds.h = 0 ;
+    if ( m_label.empty() )
+        bounds.h = 0;

 
     bounds.h += MacGetLeftBorderSize() + MacGetRightBorderSize();
     bounds.v += MacGetTopBorderSize() + MacGetBottomBorderSize();
 
     bounds.h += MacGetLeftBorderSize() + MacGetRightBorderSize();
     bounds.v += MacGetTopBorderSize() + MacGetBottomBorderSize();


@@ -99,7 +113,7 @@ wxSize wxStaticText::DoGetBestSize() const
 
 void wxStaticText::SetLabel( const wxString& st )
 {
 
 void wxStaticText::SetLabel( const wxString& st )
 {

-    m_label = wxStripMenuCodes( st );
+    m_label = GetLabelText( st );

 
     wxMacCFStringHolder str( m_label, m_font.GetEncoding() );
     CFStringRef ref = str;
 
     wxMacCFStringHolder str( m_label, m_font.GetEncoding() );
     CFStringRef ref = str;


@@ -115,7 +129,7 @@ void wxStaticText::SetLabel( const wxString& st )
     Refresh();
 
     // we shouldn't need forced updates
     Refresh();
 
     // we shouldn't need forced updates

-    // Update() ;
+    // Update();

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


@@ -135,4 +149,3 @@ bool wxStaticText::SetFont(const wxFont& font)
 }
 
 #endif //if wxUSE_STATTEXT
 }
 
 #endif //if wxUSE_STATTEXT

-