X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/90b959aee428b26304ee0056864af48775051496..02a1dfbae942c883d8651e34dcfbc5153aabc56e:/src/mac/stattext.cpp

diff --git a/src/mac/stattext.cpp b/src/mac/stattext.cpp
index 6439400bf3..2982b7c5c4 100644
--- a/src/mac/stattext.cpp
+++ b/src/mac/stattext.cpp
@@ -6,7 +6,7 @@
 // Created:     04/01/98
 // RCS-ID:      $Id$
 // Copyright:   (c) AUTHOR
-// Licence:   	wxWindows licence
+// Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__
@@ -19,6 +19,8 @@
 #include "wx/tabctrl.h"
 #include "wx/dc.h"
 #include "wx/dcclient.h"
+#include "wx/utils.h"
+#include "wx/settings.h"
 
 #include <stdio.h>
 
@@ -26,7 +28,7 @@
 IMPLEMENT_DYNAMIC_CLASS(wxStaticText, wxControl)
 #endif
 
-#include <wx/mac/uma.h>
+#include "wx/mac/uma.h"
 
 BEGIN_EVENT_TABLE(wxStaticText, wxStaticTextBase)
     EVT_PAINT(wxStaticText::OnPaint)
@@ -44,15 +46,15 @@ bool wxStaticText::Create(wxWindow *parent, wxWindowID id,
     m_foregroundColour = parent->GetForegroundColour() ;
 
     if ( id == -1 )
-  	    m_windowId = (int)NewControlId();
+        m_windowId = (int)NewControlId();
     else
-	    m_windowId = id;
+        m_windowId = id;
 
     m_windowStyle = style;
     m_label = label ;
 
-	bool ret = wxControl::Create( parent, id, pos, size, style , wxDefaultValidator , name );
-	SetBestSize( size ) ;
+    bool ret = wxControl::Create( parent, id, pos, size, style , wxDefaultValidator , name );
+    SetBestSize( size ) ;
     
     return ret;
 }
@@ -68,58 +70,58 @@ void wxStaticText::DrawParagraph(wxDC &dc, wxString paragraph)
   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 ;
-		}
-	}
+        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 )
@@ -127,47 +129,20 @@ void wxStaticText::OnDraw( wxDC &dc )
     if (m_width <= 0 || m_height <= 0)
         return;
 
+  if ( !IsWindowHilited( (WindowRef) MacGetRootWindow() ) && 
+    ( GetBackgroundColour() == wxSystemSettings::GetColour(wxSYS_COLOUR_3DFACE ) 
+      || GetBackgroundColour() == wxSystemSettings::GetColour(wxSYS_COLOUR_APPWORKSPACE) ) )
+  {
+    dc.SetTextForeground( wxColour( 0x80 , 0x80 , 0x80 ) ) ;
+  }
+  else
+  {
+    dc.SetTextForeground( GetForegroundColour() ) ;
+  }
+  
   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];
@@ -189,14 +164,17 @@ void wxStaticText::OnPaint( wxPaintEvent &event )
 
 wxSize wxStaticText::DoGetBestSize() const
 {
-	int x , y  ;
-   int widthTextMax = 0, widthLine,
+    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 ) {
+    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
@@ -206,12 +184,17 @@ wxSize wxStaticText::DoGetBestSize() const
                     GetTextExtent(_T("W"), NULL, &heightLineDefault);
 
                 heightTextTotal += heightLineDefault;
+                
+                heightTextTotal++;  // FIXME: why is this necessary?
             }
-            else {
+            else
+            {
                 GetTextExtent(curLine, &widthLine, &heightLine);
                 if ( widthLine > widthTextMax )
                     widthTextMax = widthLine;
                 heightTextTotal += heightLine;
+                
+                heightTextTotal++;  // FIXME: why is this necessary?
             }
 
             if ( *pc == wxT('\n') ) {
@@ -238,7 +221,5 @@ void wxStaticText::SetLabel(const wxString& st )
 		SetSize( GetBestSize() ) ;
 
 	Refresh() ;	
-	MacUpdateImmediately() ;
-//    wxClientDC dc(this);
-//    OnDraw( dc ) ;
+	Update() ;
 }