X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/d015713e787da8241e92ff86ee2e911868b8024c..73fe67bd60b57f95dc63809f7843ed2a15928436:/src/mac/carbon/stattext.cpp

diff --git a/src/mac/carbon/stattext.cpp b/src/mac/carbon/stattext.cpp
index 06d6fe9c3c..c6a6dd4e1a 100644
--- a/src/mac/carbon/stattext.cpp
+++ b/src/mac/carbon/stattext.cpp
@@ -1,12 +1,12 @@
 /////////////////////////////////////////////////////////////////////////////
 // Name:        stattext.cpp
 // Purpose:     wxStaticText
-// Author:      AUTHOR
+// Author:      Stefan Csomor
 // Modified by:
 // Created:     04/01/98
 // RCS-ID:      $Id$
-// Copyright:   (c) AUTHOR
-// Licence:   	wxWindows licence
+// Copyright:   (c) Stefan Csomor
+// Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__
@@ -15,6 +15,12 @@
 
 #include "wx/app.h"
 #include "wx/stattext.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 <stdio.h>
 
@@ -22,11 +28,7 @@
 IMPLEMENT_DYNAMIC_CLASS(wxStaticText, wxControl)
 #endif
 
-#include <wx/mac/uma.h>
-
-BEGIN_EVENT_TABLE(wxStaticText, wxControl)
-    EVT_PAINT(wxStaticText::OnPaint)
-END_EVENT_TABLE()
+#include "wx/mac/uma.h"
 
 bool wxStaticText::Create(wxWindow *parent, wxWindowID id,
            const wxString& label,
@@ -35,229 +37,66 @@ bool wxStaticText::Create(wxWindow *parent, wxWindowID id,
            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_windowStyle = style;
-    m_label = label ;
-
-	bool ret = wxControl::Create( parent, id, pos, size, style , wxDefaultValidator , name );
-	SetSizeOrDefault( size ) ;
+    m_macIsUserPane = FALSE ;
     
-    return ret;
-}
+    m_label = wxStripMenuCodes(label) ;
 
-void wxStaticText::OnDraw( wxDC &dc )
-{
-    if (m_width <= 0 || m_height <= 0)
-        return;
+    if ( !wxControl::Create( parent, id, pos, size, style,
+                             wxDefaultValidator , name ) )
+    {
+        return false;
+    }
 
-    PrepareDC(dc);
-    dc.Clear() ;
-    
-    int x = 0 ;
-    int y = 0 ;
-    wxString text = m_label ;
-    wxString paragraph ;
-   	int i = 0 ;
-   	int laststop = 0 ;
-   	long width, height ;
+    Rect bounds = wxMacGetBoundsForControl( this , pos , size ) ;
+    wxMacCFStringHolder str(m_label,m_font.GetEncoding() ) ;
+    verify_noerr(CreateStaticTextControl(MAC_WXHWND(parent->MacGetTopLevelWindowRef()),&bounds, str , 
+        NULL , (ControlRef*)&m_macControl ) ) ;  
 
-   	while( i < text.Length() )
-   	{
-		if( text[i] == 13 || text[i] == 10)
-		{
-   			paragraph = text.Mid( laststop , i - laststop ) ;
-   			while( paragraph.Length() > 0 )
-   			{
-   				dc.GetTextExtent( paragraph , &width , &height ) ;
-   				if ( width > m_width )
-   				{
-	   				for ( int p = paragraph.Length() -1 ; p > 0 ; --p )
-	   				{
-	   					if ( paragraph[p]=='.' )
-	   					{
-	   						dc.GetTextExtent( paragraph.Left(p+1) , &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+1), pos , y) ;
-	     						y += height ;
-	   							paragraph = paragraph.Mid(p+1) ;
-	   							break ;
-	   						}
-	   					}
-	   					if ( paragraph[p]==' ' )
-	   					{
-	   						dc.GetTextExtent( paragraph.Left(p) , &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), pos , y) ;
-	     						y += height ;
-	   							paragraph = paragraph.Mid(p+1) ;
-	   							break ;
-	   						}
-	   					}
-	   				}
-	   			}
-	   			else
-	   			{
-	     			dc.DrawText( paragraph, x , y) ;
-	     			paragraph="";
-	     			y += height ;
-	   			}
-	   		}
-   			laststop = i+1 ;
-		}
-   		++i ;
-   	}
-   	paragraph = text.Mid( laststop , text.Length() - laststop ) ;
-	while( paragraph.Length() > 0 )
-	{
-		dc.GetTextExtent( paragraph , &width , &height ) ;
-		if ( width > m_width )
-		{
-			for ( int p = paragraph.Length() -1 ; p > 0 ; --p )
-			{
-				if ( paragraph[p]=='.' )
-				{
-					dc.GetTextExtent( paragraph.Left(p+1) , &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+1), pos , y) ;
- 						y += height ;
-						paragraph = paragraph.Mid(p+1) ;
-						break ;
-					}
-				}
-				if ( paragraph[p]==' ' )
-				{
-					dc.GetTextExtent( paragraph.Left(p) , &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), pos , y) ;
- 						y += height ;
-						paragraph = paragraph.Mid(p+1) ;
-						break ;
-					}
-				}
-			}
-		}
-		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 ;
-		}
- 	}
-}
+    MacPostControlCreate(pos,size) ;
 
-void wxStaticText::OnPaint( wxPaintEvent &event ) 
-{
-    wxPaintDC dc(this);
-    OnDraw( dc ) ;
+    return true;
 }
 
 wxSize wxStaticText::DoGetBestSize() const
 {
-	int x , y  ;
-   int widthTextMax = 0, widthLine,
-        heightTextTotal = 0, heightLineDefault = 0, heightLine = 0;
+    ControlFontStyleRec controlFont ;
+    Size outSize ;
+    verify_noerr( GetControlData( (ControlRef) m_macControl , kControlEntireControl , kControlFontStyleTag , sizeof(controlFont) , &controlFont , &outSize ) ) ;
+    
+    Point bounds ;
+    SInt16 baseline ;
+    wxMacCFStringHolder str(m_label ,  m_font.GetEncoding() ) ;
+    verify_noerr( GetThemeTextDimensions( (m_label.Length() > 0 ? ((CFStringRef) str ) : CFSTR(" ") ) , m_font.MacGetThemeFontID() , kThemeStateActive , false , &bounds , &baseline ) ) ;
+    if ( m_label.Length() == 0 )
+        bounds.h = 0 ;
+    return wxSize(bounds.h, bounds.v);
+}
 
-    wxString curLine;
-    for ( const wxChar *pc = m_label; ; pc++ ) {
-        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);
+void wxStaticText::SetLabel(const wxString& st )
+{
 
-                heightTextTotal += heightLineDefault;
-            }
-            else {
-                GetTextExtent(curLine, &widthLine, &heightLine);
-                if ( widthLine > widthTextMax )
-                    widthTextMax = widthLine;
-                heightTextTotal += heightLine;
-            }
+    m_label = wxStripMenuCodes(st) ;
+    
+    wxMacCFStringHolder str(m_label,m_font.GetEncoding() ) ;
+    CFStringRef ref = str ;
+    SetControlData( (ControlRef) m_macControl, kControlEntireControl , kControlStaticTextCFStringTag, sizeof( CFStringRef ),
+		&ref );
 
-            if ( *pc == wxT('\n') ) {
-               curLine.Empty();
-            }
-            else {
-               // the end of string
-               break;
-            }
-        }
-        else {
-            curLine += *pc;
-        }
-    }
+    if ( !(GetWindowStyle() & wxST_NO_AUTORESIZE) )
+        SetSize( GetBestSize() ) ;
 
-    return wxSize(widthTextMax, heightTextTotal);
+    Update() ;
 }
 
-void wxStaticText::SetLabel(const wxString& st )
+bool wxStaticText::SetFont(const wxFont& font)
 {
-	SetTitle( st ) ;
-	m_label = st ;
-	if ( !(GetWindowStyle() & wxST_NO_AUTORESIZE) )
-		SetSizeOrDefault() ;
-	
-    wxClientDC dc(this);
-    OnDraw( dc ) ;
+    bool ret = wxControl::SetFont(font);
+
+	if ( ret )
+	{
+	    if ( !(GetWindowStyle() & wxST_NO_AUTORESIZE) )
+	        SetSize( GetBestSize() );
+	}
+
+    return ret;
 }