From 9714ffa0c4a0de3f5a2e268b667ca0064f72307a Mon Sep 17 00:00:00 2001
From: Stefan Csomor <csomor@advancedconcepts.ch>
Date: Tue, 26 Jun 2001 18:45:16 +0000
Subject: [PATCH] added tiered implementation (using draw paragraph) for
 stattext, corrected scrollbar paging, forced redraw before scrolling

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10671 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---
 src/mac/carbon/scrolbar.cpp |  10 +-
 src/mac/carbon/stattext.cpp | 217 +++++++++++++-----------------------
 src/mac/scrolbar.cpp        |  10 +-
 src/mac/stattext.cpp        | 217 +++++++++++++-----------------------
 4 files changed, 168 insertions(+), 286 deletions(-)

diff --git a/src/mac/carbon/scrolbar.cpp b/src/mac/carbon/scrolbar.cpp
index 0c1a130c78..a022802c05 100644
--- a/src/mac/carbon/scrolbar.cpp
+++ b/src/mac/carbon/scrolbar.cpp
@@ -41,7 +41,7 @@ bool wxScrollBar::Create(wxWindow *parent, wxWindowID id,
 	
 	MacPreControlCreate( parent , id ,  "" , pos , size ,style, validator , name , &bounds , title ) ;
 
-	m_macControl = UMANewControl( parent->GetMacRootWindow() , &bounds , title , false , 0 , 0 , 100, 
+	m_macControl = UMANewControl( parent->GetMacRootWindow() , &bounds , title , true , 0 , 0 , 100, 
 		kControlScrollBarLiveProc , (long) this ) ;
 	
 	wxASSERT_MSG( m_macControl != NULL , "No valid mac control" ) ;
@@ -112,19 +112,19 @@ void wxScrollBar::MacHandleControlClick( ControlHandle control , SInt16 controlp
 	switch( controlpart )
 	{
 		case kControlUpButtonPart :
-        nScrollInc = -1;
+        nScrollInc = -m_pageSize;
         scrollEvent = wxEVT_SCROLL_LINEUP;
 			break ;
 		case kControlDownButtonPart :
-        nScrollInc = 1;
+        nScrollInc = m_pageSize;
         scrollEvent = wxEVT_SCROLL_LINEDOWN;
 			break ;
 		case kControlPageUpPart :
-        nScrollInc = -m_pageSize;
+        nScrollInc = -m_viewSize;
         scrollEvent = wxEVT_SCROLL_PAGEUP;
 			break ;
 		case kControlPageDownPart :
-        nScrollInc = m_pageSize;
+        nScrollInc = m_viewSize;
         scrollEvent = wxEVT_SCROLL_PAGEDOWN;
 			break ;
 		case kControlIndicatorPart :
diff --git a/src/mac/carbon/stattext.cpp b/src/mac/carbon/stattext.cpp
index 26f16be642..783d231f9b 100644
--- a/src/mac/carbon/stattext.cpp
+++ b/src/mac/carbon/stattext.cpp
@@ -57,11 +57,80 @@ bool wxStaticText::Create(wxWindow *parent, wxWindowID id,
     return ret;
 }
 
+const wxString punct = " ,.-;:!?";
+
+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 ;
+		}
+	}
+}
+
 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 ;
@@ -99,145 +168,17 @@ void wxStaticText::OnDraw( wxDC &dc )
 	if ( doClear )
 		dc.Clear() ;
 		
-    int x = 0 ;
-    int y = 0 ;
-    wxString text = m_label ;
-    wxString paragraph ;
-   	int i = 0 ;
-   	int laststop = 0 ;
-   	long width, height ;
-
-   	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 )
+	while (i < text.Length())
 	{
-		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 ;
-		}
- 	}
+	  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 ) 
diff --git a/src/mac/scrolbar.cpp b/src/mac/scrolbar.cpp
index 0c1a130c78..a022802c05 100644
--- a/src/mac/scrolbar.cpp
+++ b/src/mac/scrolbar.cpp
@@ -41,7 +41,7 @@ bool wxScrollBar::Create(wxWindow *parent, wxWindowID id,
 	
 	MacPreControlCreate( parent , id ,  "" , pos , size ,style, validator , name , &bounds , title ) ;
 
-	m_macControl = UMANewControl( parent->GetMacRootWindow() , &bounds , title , false , 0 , 0 , 100, 
+	m_macControl = UMANewControl( parent->GetMacRootWindow() , &bounds , title , true , 0 , 0 , 100, 
 		kControlScrollBarLiveProc , (long) this ) ;
 	
 	wxASSERT_MSG( m_macControl != NULL , "No valid mac control" ) ;
@@ -112,19 +112,19 @@ void wxScrollBar::MacHandleControlClick( ControlHandle control , SInt16 controlp
 	switch( controlpart )
 	{
 		case kControlUpButtonPart :
-        nScrollInc = -1;
+        nScrollInc = -m_pageSize;
         scrollEvent = wxEVT_SCROLL_LINEUP;
 			break ;
 		case kControlDownButtonPart :
-        nScrollInc = 1;
+        nScrollInc = m_pageSize;
         scrollEvent = wxEVT_SCROLL_LINEDOWN;
 			break ;
 		case kControlPageUpPart :
-        nScrollInc = -m_pageSize;
+        nScrollInc = -m_viewSize;
         scrollEvent = wxEVT_SCROLL_PAGEUP;
 			break ;
 		case kControlPageDownPart :
-        nScrollInc = m_pageSize;
+        nScrollInc = m_viewSize;
         scrollEvent = wxEVT_SCROLL_PAGEDOWN;
 			break ;
 		case kControlIndicatorPart :
diff --git a/src/mac/stattext.cpp b/src/mac/stattext.cpp
index 26f16be642..783d231f9b 100644
--- a/src/mac/stattext.cpp
+++ b/src/mac/stattext.cpp
@@ -57,11 +57,80 @@ bool wxStaticText::Create(wxWindow *parent, wxWindowID id,
     return ret;
 }
 
+const wxString punct = " ,.-;:!?";
+
+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 ;
+		}
+	}
+}
+
 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 ;
@@ -99,145 +168,17 @@ void wxStaticText::OnDraw( wxDC &dc )
 	if ( doClear )
 		dc.Clear() ;
 		
-    int x = 0 ;
-    int y = 0 ;
-    wxString text = m_label ;
-    wxString paragraph ;
-   	int i = 0 ;
-   	int laststop = 0 ;
-   	long width, height ;
-
-   	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 )
+	while (i < text.Length())
 	{
-		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 ;
-		}
- 	}
+	  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 ) 
-- 
2.47.2