don't assert in SetSelection(wxNOT_FOUND), just clear text zone contents (patch 1707475)

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

diff --git a/src/mac/carbon/stattext.cpp b/src/mac/carbon/stattext.cpp
index 8f78cc60ff6cc093781ea700c108ad31d73a17db..236c88000eeb194913f7e3db34ccdd549ebc59bf 100644 (file)
--- a/src/mac/carbon/stattext.cpp
+++ b/src/mac/carbon/stattext.cpp
@@ -1,252 +1,206 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

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

 // Purpose:     wxStaticText
 // Purpose:     wxStaticText

-// Author:      AUTHOR
+// Author:      Stefan Csomor

 // Modified by:
 // Created:     04/01/98
 // RCS-ID:      $Id$
 // Modified by:
 // Created:     04/01/98
 // RCS-ID:      $Id$

-// Copyright:   (c) AUTHOR
-// Licence:    wxWindows licence
+// 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"
 #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/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"

 
 

-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() ;
+    m_macIsUserPane = false;

 
 

-    if ( id == -1 )
-           m_windowId = (int)NewControlId();
-    else
-           m_windowId = id;
+    if ( !wxControl::Create( parent, id, pos, size, style, wxDefaultValidator, name ) )
+        return false;

 
 

-    m_windowStyle = style;
-    m_label = label ;
+    Rect bounds = wxMacGetBoundsForControl( this, pos, size );

 
 

-       bool ret = wxControl::Create( parent, id, pos, size, style , wxDefaultValidator , name );
-       SetBestSize( size ) ;
-    
-    return ret;
-}
+    m_peer = new wxMacControl( this );
+    OSStatus err = CreateStaticTextControl(
+        MAC_WXHWND(parent->MacGetTopLevelWindowRef()),
+        &bounds, NULL, NULL, m_peer->GetControlRefAddr() );
+    verify_noerr( err );

 
 

-const wxString punct = " ,.-;:!?";
+    if ( ( style & wxST_ELLIPSIZE_END ) || ( style & wxST_ELLIPSIZE_MIDDLE ) )
+    {
+        TruncCode tCode = truncEnd;
+        if ( style & wxST_ELLIPSIZE_MIDDLE )
+            tCode = truncMiddle;

 
 

-void wxStaticText::DrawParagraph(wxDC &dc, wxString paragraph)
-{
-  int x = 0 ;
-  int y = 0 ;
-  int i = 0 ;
-  long width, height ;
-  bool linedrawn = true;
-  while( paragraph.Length() > 0 )
-  {
-               dc.GetTextExtent( paragraph , &width , &height ) ;
-                                       
-               if ( width > m_width )
-               {
-                       for ( int 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 ;
-               }
-       }
+        err = m_peer->SetData( kControlStaticTextTruncTag, tCode );
+        err = m_peer->SetData( kControlStaticTextIsMultilineTag, (Boolean)0 );
+    }
+
+    MacPostControlCreate( pos, size );
+
+    SetLabel(label);
+
+    return true;

 }
 
 }
 

-void wxStaticText::OnDraw( wxDC &dc )
+wxSize wxStaticText::DoGetBestSize() const

 {
 {

-    if (m_width <= 0 || m_height <= 0)
-        return;
+    Rect bestsize = { 0 , 0 , 0 , 0 } ;
+    Point bounds;
+    
+    // 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 );
+    if ( !EmptyRect( &bestsize ) )
+    {
+        bounds.h = bestsize.right - bestsize.left ;
+        bounds.v = bestsize.bottom - bestsize.top ;
+    }
+    else
+    {
+        ControlFontStyleRec controlFont;
+        OSStatus err = m_peer->GetData<ControlFontStyleRec>( kControlEntireControl, kControlFontStyleTag, &controlFont );
+        verify_noerr( err );

 
 

-  wxString paragraph;
-  int i = 0 ;
-  wxString text = m_label;
+        SInt16 baseline;
+        wxMacCFStringHolder str( m_label,  m_font.GetEncoding() );

 
 

-    PrepareDC(dc);
-    
-    bool doClear = true ;
-       WindowRef window = GetMacRootWindow() ;
-       if ( window )
-       {
-               wxWindow* win = wxFindWinFromMacWindow( window ) ;
-               if ( win )
-               {
-                       wxWindow* parent = GetParent() ;
-                       while ( parent )
-                       {
-                               if( parent->MacGetWindowData() )
-                               {
-                                       break ;
-                               }
-                               
-                               if( parent->IsKindOf( CLASSINFO( wxNotebook ) ) ||  parent->IsKindOf( CLASSINFO( wxTabCtrl ) ))
-                               {
-                                       if ( ((wxControl*)parent)->GetMacControl() ) {
-                                               Rect rect = { -10000 , -10000 , 10000 , 10000 } ; // MacOS X was having a coord rollover
-                                               if ( DrawThemeTabPane != (void*)kUnresolvedCFragSymbolAddress )
-                                               {
-                                                 DrawThemeTabPane ( &rect, kThemeStateActive);
-                                                 doClear = false ;
-                                               }
-                                       }
-                                       break ;
-                               }
-                               
-                               parent = parent->GetParent() ;
-                       } 
-               }
-       }
-       if ( doClear )
-               dc.Clear() ;
-               
-       while (i < text.Length())
-       {
-         paragraph += text[i];
-         
-       if (text[i] == 13 || text[i] == 10)
-           DrawParagraph(dc, paragraph);
-           
-    ++i;
-  }
-  if (paragraph.Length() > 0)
-         DrawParagraph(dc, paragraph);
+        if ( m_font.MacGetThemeFontID() != kThemeCurrentPortFont )
+        {
+            err = GetThemeTextDimensions(
+                (!m_label.empty() ? (CFStringRef)str : CFSTR(" ")),
+                m_font.MacGetThemeFontID(), kThemeStateActive, false, &bounds, &baseline );
+            verify_noerr( err );
+        }
+        else
+        {
+    #if wxMAC_USE_CORE_GRAPHICS
+            wxClientDC dc(const_cast<wxStaticText*>(this));
+            wxCoord width, height ;
+            dc.GetTextExtent( m_label , &width, &height);
+            bounds.h = width;
+            bounds.v = height;
+    #else
+            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 );
+    #endif
+        }
+
+        if ( m_label.empty() )
+            bounds.h = 0;
+    }
+    bounds.h += MacGetLeftBorderSize() + MacGetRightBorderSize();
+    bounds.v += MacGetTopBorderSize() + MacGetBottomBorderSize();
+
+    return wxSize( bounds.h, bounds.v );

 }
 
 }
 

-void wxStaticText::OnPaint( wxPaintEvent &event ) 
+void wxStaticText::SetLabel(const wxString& label)

 {
 {

-    wxPaintDC dc(this);
-    OnDraw( dc ) ;
+    m_labelOrig = label;
+
+    // middle/end ellipsization is handled by the OS:
+    if ( HasFlag(wxST_ELLIPSIZE_END) || HasFlag(wxST_ELLIPSIZE_MIDDLE) )
+    {
+        // remove markup
+        wxString str(label);
+        if (HasFlag(wxST_MARKUP))
+            str = RemoveMarkup(label);
+
+        // and leave ellipsization to the OS
+        DoSetLabel(str);
+    }
+    else // not supported natively
+    {
+        DoSetLabel(GetEllipsizedLabelWithoutMarkup());
+    }
+
+    if ( !(GetWindowStyle() & wxST_NO_AUTORESIZE) &&
+         !IsEllipsized() )  // don't resize if we adjust to current size
+    {
+        InvalidateBestSize();
+        SetSize( GetBestSize() );
+    }
+
+    Refresh();
+
+    // we shouldn't need forced updates
+    // Update();

 }
 
 }
 

-wxSize wxStaticText::DoGetBestSize() const
+bool wxStaticText::SetFont(const wxFont& font)

 {
 {

-       int x,y ;
-    int widthTextMax = 0, widthLine,
-        heightTextTotal = 0, heightLineDefault = 0, heightLine = 0;
-        
-    wxString curLine;
-    for ( const wxChar *pc = m_label; ; pc++ )
+    bool ret = wxControl::SetFont( font );
+
+    if ( ret )

     {
     {

-        if ( *pc == wxT('\n') || *pc == wxT('\0') )
+        if ( !(GetWindowStyle() & wxST_NO_AUTORESIZE) )

         {
         {

-            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);
+    return ret;

 }
 
 }
 

-void wxStaticText::SetLabel(const wxString& st )
+
+// for wxST_ELLIPSIZE_* support:
+
+void wxStaticText::DoSetLabel(const wxString& label)

 {
 {

-       SetTitle( st ) ;
-       m_label = st ;
-       if ( !(GetWindowStyle() & wxST_NO_AUTORESIZE) )
-               SetSize( GetBestSize() ) ;
-
-       Refresh() ;     
-       MacUpdateImmediately() ;
-//    wxClientDC dc(this);
-//    OnDraw( dc ) ;
+    m_label = RemoveMnemonics(label);
+
+    wxMacCFStringHolder str( m_label, m_font.GetEncoding() );
+    OSStatus err = m_peer->SetData<CFStringRef>(kControlEntireControl, kControlStaticTextCFStringTag, str);
+    verify_noerr( err );
+}
+
+wxString wxStaticText::DoGetLabel() const
+{
+    return m_label;

 }
 }

+
+/*
+   FIXME: UpdateLabel() should be called on size events when wxST_ELLIPSIZE_START is set
+          to allow correct dynamic ellipsizing of the label
+*/
+
+#endif //if wxUSE_STATTEXT