X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/8208e181cb576ec6cda37624923f95a59af43072..31a06b07cce898a22d0ca3992501e85da9c22f13:/src/mac/carbon/stattext.cpp

diff --git a/src/mac/carbon/stattext.cpp b/src/mac/carbon/stattext.cpp
index b249fc0e11..d364a2c5be 100644
--- a/src/mac/carbon/stattext.cpp
+++ b/src/mac/carbon/stattext.cpp
@@ -15,14 +15,20 @@
 
 #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 <stdio.h>
 
+#if !USE_SHARED_LIBRARY
 IMPLEMENT_DYNAMIC_CLASS(wxStaticText, wxControl)
+#endif
 
-#include <wx/mac/uma.h>
+#include "wx/mac/uma.h"
 
-BEGIN_EVENT_TABLE(wxStaticText, wxControl)
+BEGIN_EVENT_TABLE(wxStaticText, wxStaticTextBase)
     EVT_PAINT(wxStaticText::OnPaint)
 END_EVENT_TABLE()
 
@@ -46,74 +52,201 @@ bool wxStaticText::Create(wxWindow *parent, wxWindowID id,
     m_label = label ;
 
 	bool ret = wxControl::Create( parent, id, pos, size, style , wxDefaultValidator , name );
-	SetSizeOrDefault( size ) ;
+	SetBestSize( size ) ;
     
     return ret;
 }
 
-void wxStaticText::OnPaint( wxPaintEvent &event ) 
-{
-    wxPaintDC dc(this);
-    PrepareDC(dc);
-    dc.Clear() ;
-    dc.DrawText( m_label , 0 , 0 ) ;
-}
+const wxString punct = " ,.-;:!?";
 
-wxSize wxStaticText::DoGetBestSize() const
+void wxStaticText::DrawParagraph(wxDC &dc, wxString paragraph)
 {
-	int x , y  ;
-	GetTextExtent( m_label , &x , &y ) ;
-	return wxSize( x , y ) ;
+  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 ;
+		}
+	}
 }
 
-void wxStaticText::SetLabel(const wxString& st , bool resize )
+void wxStaticText::OnDraw( wxDC &dc )
 {
-	SetTitle( st ) ;
-	m_label = st ;
-	if ( resize )
-		SetSizeOrDefault() ;
-	else
-		Refresh() ;
+    if (m_width <= 0 || m_height <= 0)
+        return;
+
+  wxString paragraph;
+  int i = 0 ;
+  wxString text = m_label;
+
+    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 = { -32767 , -32767 , 32767 , 32767 } ;
+						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);
 }
-/*
-void wxStaticText::SetSize(int x, int y, int width, int height, int sizeFlags)
+
+void wxStaticText::OnPaint( wxPaintEvent &event ) 
 {
-    wxControl::SetSize( x , y , width , height , sizeFlags ) ;
+    wxPaintDC dc(this);
+    OnDraw( dc ) ;
 }
 
-bool wxStaticText::Create(wxWindow *parent, wxWindowID id,
-           const wxString& label,
-           const wxPoint& pos,
-           const wxSize& size,
-           long style,
-           const wxString& name)
+wxSize wxStaticText::DoGetBestSize() const
 {
-	Rect bounds ;
-	Str255 title ;
-	
-	MacPreControlCreate( parent , id ,  label , pos , size ,style, *((wxValidator*)NULL) , name , &bounds , title ) ;
-
-	m_macControl = UMANewControl( parent->GetMacRootWindow() , &bounds , "\p" , true , 0 , 0 , 1, 
-	  	kControlStaticTextProc , (long) this ) ;
-	::UMASetControlData( m_macControl, kControlLabelPart, kControlStaticTextTextTag , (long) title[0] , (char*) &title[1] ) ;
-	
-	MacPostControlCreate() ;
-
-  return TRUE;
+	int x,y ;
+    int widthTextMax = 0, widthLine,
+        heightTextTotal = 0, heightLineDefault = 0, heightLine = 0;
+        
+    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);
+
+                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;
+        }
+    }
+
+    return wxSize(widthTextMax, heightTextTotal);
 }
 
-void wxStaticText::SetLabel(const wxString& st , bool resize )
+void wxStaticText::SetLabel(const wxString& st )
 {
 	SetTitle( st ) ;
-	wxString label ;
-	
-	if( wxApp::s_macDefaultEncodingIsPC )
-		label = wxMacMakeMacStringFromPC( st ) ;
-	else
-		label = st ;
-		
-	::UMASetControlData( m_macControl, kControlLabelPart, kControlStaticTextTextTag , (long) label.Length() , (char*)(const char*) label ) ;
-	Refresh() ;
-}
-*/
+	m_label = st ;
+	if ( !(GetWindowStyle() & wxST_NO_AUTORESIZE) )
+		SetSize( GetBestSize() ) ;
 
+	Refresh() ;	
+	MacUpdateImmediately() ;
+//    wxClientDC dc(this);
+//    OnDraw( dc ) ;
+}