X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/cd3c2375e6fddd3d478a6776900c21aaeb2d0f08..85a0a12a9c6fe2885c0de8801e91a2f6d6e4119a:/src/mac/carbon/stattext.cpp

diff --git a/src/mac/carbon/stattext.cpp b/src/mac/carbon/stattext.cpp
index 9a56b744e2..0898022392 100644
--- a/src/mac/carbon/stattext.cpp
+++ b/src/mac/carbon/stattext.cpp
@@ -1,257 +1,151 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        stattext.cpp
+// Name:        src/mac/carbon/stattext.cpp
 // Purpose:     wxStaticText
-// Author:      AUTHOR
+// Author:      Stefan Csomor
 // Modified by:
 // Created:     04/01/98
 // RCS-ID:      $Id$
-// Copyright:   (c) AUTHOR
+// Copyright:   (c) Stefan Csomor
 // 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"
+
+#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/dc.h"
-#include "wx/dcclient.h"
-#include "wx/utils.h"
-#include "wx/settings.h"
+
+#include "wx/mac/uma.h"
 
 #include <stdio.h>
 
-#if !USE_SHARED_LIBRARY
 IMPLEMENT_DYNAMIC_CLASS(wxStaticText, wxControl)
-#endif
 
-#include "wx/mac/uma.h"
 
-BEGIN_EVENT_TABLE(wxStaticText, wxStaticTextBase)
-    EVT_PAINT(wxStaticText::OnPaint)
-END_EVENT_TABLE()
-
-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 )
 {
-    SetName(name);
-    m_backgroundColour = parent->GetBackgroundColour() ;
-    m_foregroundColour = parent->GetForegroundColour() ;
-
-    if ( id == -1 )
-        m_windowId = (int)NewControlId();
-    else
-        m_windowId = id;
+    m_macIsUserPane = false;
 
-    m_windowStyle = style;
-    m_label = wxStripMenuCodes(label) ;
+    m_label = GetLabelText( label );
 
-    bool ret = wxControl::Create( parent, id, pos, size, style , wxDefaultValidator , name );
-    SetBestSize( size ) ;
+    if ( !wxControl::Create( parent, id, pos, size, style, wxDefaultValidator, name ) )
+        return false;
 
-    return ret;
-}
+    Rect bounds = wxMacGetBoundsForControl( this, pos, size );
+    wxMacCFStringHolder str( m_label, m_font.GetEncoding() );
 
-const wxString punct = " ,.-;:!?";
+    m_peer = new wxMacControl( this );
+    OSStatus err = CreateStaticTextControl(
+        MAC_WXHWND(parent->MacGetTopLevelWindowRef()),
+        &bounds, str, NULL, m_peer->GetControlRefAddr() );
+    verify_noerr( err );
 
-void wxStaticText::DrawParagraph(wxDC &dc, wxString paragraph, int &y)
-{
-    long width, height ;
-  
-    if (paragraph.Length() == 0)
+    if ( ( style & wxST_DOTS_END ) || ( style & wxST_DOTS_MIDDLE ) )
     {
-        // empty line
-        dc.GetTextExtent( "H", &width, &height );
-        y += height;
-        
-        return;
+        TruncCode tCode = truncEnd;
+        if ( style & wxST_DOTS_MIDDLE )
+            tCode = truncMiddle;
+
+        err = m_peer->SetData( kControlStaticTextTruncTag, tCode );
+        err = m_peer->SetData( kControlStaticTextIsMultilineTag, (Boolean)0 );
     }
 
-    int x = 0 ;
+    MacPostControlCreate( pos, size );
 
-    bool linedrawn = true;
-    while( paragraph.Length() > 0 )
-    {
-        dc.GetTextExtent( paragraph , &width , &height ) ;
-        
-        if ( width > m_width )
-        {
-            for ( size_t p = paragraph.Length() - 1 ; p > 0 ; --p )
-            {
-                if ((punct.Find(paragraph[p]) != wxNOT_FOUND) || !linedrawn)
-                {
-                    int blank = (paragraph[p] == ' ') ? 0 : 1;
-                    
-                    dc.GetTextExtent( paragraph.Left(p + blank) , &width , &height ) ;
-                    
-                    if ( width <= m_width )
-                    {
-                        int pos = x ;
-                        if ( HasFlag( wxALIGN_CENTER ) )
-                        {
-                            pos += ( m_width - width ) / 2 ;
-                        }
-                        else if ( HasFlag( wxALIGN_RIGHT ) )
-                        {
-                            pos += ( m_width - width ) ;
-                        }
-                        
-                        dc.DrawText( paragraph.Left(p + blank), pos , y) ;
-                        y += height ;
-                        paragraph = paragraph.Mid(p+1) ;
-                        linedrawn = true;
-                        break ;
-                    }
-                }
-            }
-            
-            linedrawn = false;
-        }
-        else
-        {
-            int pos = x ;
-            if ( HasFlag( wxALIGN_CENTER ) )
-            {
-                pos += ( m_width - width ) / 2 ;
-            }
-            else if ( HasFlag( wxALIGN_RIGHT ) )
-            {
-                pos += ( m_width - width ) ;
-            }
-            
-            dc.DrawText( paragraph, pos , y) ;
-            paragraph="";
-            y += height ;
-        }
-    }
+    return true;
 }
 
-void wxStaticText::OnDraw( wxDC &dc )
+wxSize wxStaticText::DoGetBestSize() const
 {
-    if (m_width <= 0 || m_height <= 0)
-        return;
-/*
-    dc.Clear() ;
-    wxRect rect(0,0,m_width,m_height) ;
-    dc.SetFont(*wxSMALL_FONT) ;
-
-    dc.DrawRectangle(rect) ;
-*/
-  if ( !IsWindowHilited( (WindowRef) MacGetRootWindow() ) &&
-    ( GetBackgroundColour() == wxSystemSettings::GetColour(wxSYS_COLOUR_3DFACE )
-      || GetBackgroundColour() == wxSystemSettings::GetColour(wxSYS_COLOUR_APPWORKSPACE) ) )
-  {
-    dc.SetTextForeground( wxColour( 0x80 , 0x80 , 0x80 ) ) ;
-  }
-  else
-  {
-    dc.SetTextForeground( GetForegroundColour() ) ;
-  }
-
-  wxString paragraph;
-  size_t i = 0 ;
-  wxString text = m_label;
-  int y = 0 ;
-  while (i < text.Length())
-  {
-
-    if (text[i] == 13 || text[i] == 10)
+    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 )
     {
-        DrawParagraph(dc, paragraph,y);
-        paragraph = "" ;
+        err = GetThemeTextDimensions(
+            (!m_label.empty() ? (CFStringRef)str : CFSTR(" ")),
+            m_font.MacGetThemeFontID(), kThemeStateActive, false, &bounds, &baseline );
+        verify_noerr( err );
     }
     else
     {
-        paragraph += text[i];
+        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 );
     }
-    ++i;
-  }
-  if (paragraph.Length() > 0)
-      DrawParagraph(dc, paragraph,y);
-}
 
-void wxStaticText::OnPaint( wxPaintEvent & WXUNUSED(event) )
-{
-    wxPaintDC dc(this);
-    OnDraw( dc ) ;
+    if ( m_label.empty() )
+        bounds.h = 0;
+
+    bounds.h += MacGetLeftBorderSize() + MacGetRightBorderSize();
+    bounds.v += MacGetTopBorderSize() + MacGetBottomBorderSize();
+
+    return wxSize( bounds.h, bounds.v );
 }
 
-wxSize wxStaticText::DoGetBestSize() const
+void wxStaticText::SetLabel( const wxString& st )
 {
-    int widthTextMax = 0, widthLine,
-        heightTextTotal = 0, heightLineDefault = 0, heightLine = 0;
+    m_label = GetLabelText( st );
+
+    wxMacCFStringHolder str( m_label, m_font.GetEncoding() );
+    CFStringRef ref = str;
+    OSStatus err = m_peer->SetData<CFStringRef>(kControlEntireControl, kControlStaticTextCFStringTag, ref );
+    verify_noerr( err );
 
-    wxString curLine;
-    for ( const wxChar *pc = m_label; ; pc++ )
+    if ( !(GetWindowStyle() & wxST_NO_AUTORESIZE) )
     {
-        if ( *pc == wxT('\n') || *pc == wxT('\0') )
-        {
-            if ( !curLine )
-            {
-                // we can't use GetTextExtent - it will return 0 for both width
-                // and height and an empty line should count in height
-                // calculation
-                if ( !heightLineDefault )
-                    heightLineDefault = heightLine;
-                if ( !heightLineDefault )
-                    GetTextExtent(_T("W"), NULL, &heightLineDefault);
-
-                heightTextTotal += heightLineDefault;
-
-                heightTextTotal++;  // FIXME: why is this necessary?
-            }
-            else
-            {
-                GetTextExtent(curLine, &widthLine, &heightLine);
-                if ( widthLine > widthTextMax )
-                    widthTextMax = widthLine;
-                heightTextTotal += heightLine;
-
-                heightTextTotal++;  // FIXME: why is this necessary?
-            }
-
-            if ( *pc == wxT('\n') ) {
-               curLine.Empty();
-            }
-            else {
-               // the end of string
-               break;
-            }
-        }
-        else {
-            curLine += *pc;
-        }
+        InvalidateBestSize();
+        SetSize( GetBestSize() );
     }
 
-    return wxSize(widthTextMax, heightTextTotal);
-}
-
-void wxStaticText::SetLabel(const wxString& st )
-{
-    SetTitle( st ) ;
-    m_label = st ;
-    if ( !(GetWindowStyle() & wxST_NO_AUTORESIZE) )
-        SetSize( GetBestSize() ) ;
+    Refresh();
 
-    Refresh() ;
-    Update() ;
+    // we shouldn't need forced updates
+    // Update();
 }
 
 bool wxStaticText::SetFont(const wxFont& font)
 {
-    bool ret = wxControl::SetFont(font);
+    bool ret = wxControl::SetFont( font );
 
-    // adjust the size of the window to fit to the label unless autoresizing is
-    // disabled
-    if ( !(GetWindowStyle() & wxST_NO_AUTORESIZE) )
-        SetSize( GetBestSize() );
+    if ( ret )
+    {
+        if ( !(GetWindowStyle() & wxST_NO_AUTORESIZE) )
+        {
+            InvalidateBestSize();
+            SetSize( GetBestSize() );
+        }
+    }
 
     return ret;
 }
+
+#endif //if wxUSE_STATTEXT