X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/9ff647cf66f6c05aacba8eb96b818fc70d7b4939..49a91764b57168d9f441578001b3206a7330ee70:/src/mac/stattext.cpp?ds=inline

diff --git a/src/mac/stattext.cpp b/src/mac/stattext.cpp
index a99f6c4e69..6439400bf3 100644
--- a/src/mac/stattext.cpp
+++ b/src/mac/stattext.cpp
@@ -15,6 +15,8 @@
 
 #include "wx/app.h"
 #include "wx/stattext.h"
+#include "wx/notebook.h"
+#include "wx/tabctrl.h"
 #include "wx/dc.h"
 #include "wx/dcclient.h"
 
@@ -26,7 +28,7 @@ IMPLEMENT_DYNAMIC_CLASS(wxStaticText, wxControl)
 
 #include <wx/mac/uma.h>
 
-BEGIN_EVENT_TABLE(wxStaticText, wxControl)
+BEGIN_EVENT_TABLE(wxStaticText, wxStaticTextBase)
     EVT_PAINT(wxStaticText::OnPaint)
 END_EVENT_TABLE()
 
@@ -50,141 +52,56 @@ 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::OnDraw( wxDC &dc )
-{
-    if (m_width <= 0 || m_height <= 0)
-        return;
-
-    PrepareDC(dc);
-//    dc.Clear() ; this eventually draws in the wrong background colour (appearance panels)
-    
-    int x = 0 ;
-    int y = 0 ;
-    wxString text = m_label ;
-    wxString paragraph ;
-   	int i = 0 ;
-   	int laststop = 0 ;
-   	long width, height ;
+const wxString punct = " ,.-;:!?";
 
-   	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 )
-	{
+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 ( 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]==' ' )
+			{     				  
+			  if ((punct.Find(paragraph[p]) != wxNOT_FOUND) || !linedrawn)
 				{
-					dc.GetTextExtent( paragraph.Left(p) , &width , &height ) ;
+				  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), pos , y) ;
- 						y += height ;
+					  }
+					  		
+  					dc.DrawText( paragraph.Left(p + blank), pos , y) ;
+  					y += height ;
 						paragraph = paragraph.Mid(p+1) ;
+						linedrawn = true;
 						break ;
 					}
 				}
 			}
+			
+			linedrawn = false;
 		}
 		else
 		{
@@ -192,16 +109,76 @@ void wxStaticText::OnDraw( wxDC &dc )
 			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 ;
+		  }
+		  		
+  		dc.DrawText( paragraph, pos , y) ;
+  		paragraph="";
+  		y += height ;
 		}
- 	}
+	}
+}
+
+void wxStaticText::OnDraw( wxDC &dc )
+{
+    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::OnPaint( wxPaintEvent &event ) 
@@ -258,7 +235,7 @@ void wxStaticText::SetLabel(const wxString& st )
 	SetTitle( st ) ;
 	m_label = st ;
 	if ( !(GetWindowStyle() & wxST_NO_AUTORESIZE) )
-		SetSizeOrDefault() ;
+		SetSize( GetBestSize() ) ;
 
 	Refresh() ;	
 	MacUpdateImmediately() ;