From: Stefan Csomor <csomor@advancedconcepts.ch>
Date: Wed, 29 Jan 2003 15:06:08 +0000 (+0000)
Subject: bugfix : text background when using appearance text drawing
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/5fa00d2425beef9ae96e80dec962a57eb1839a5a

bugfix : text background when using appearance text drawing


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19012 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---

diff --git a/src/mac/carbon/dc.cpp b/src/mac/carbon/dc.cpp
index 1d19d743cd..b0e3183298 100644
--- a/src/mac/carbon/dc.cpp
+++ b/src/mac/carbon/dc.cpp
@@ -1379,6 +1379,21 @@ void  wxDC::DoDrawText(const wxString& strtext, wxCoord x, wxCoord y)
             	{
     	            Rect frame = { yy + line*(fi.descent + fi.ascent + fi.leading)  ,xx , yy + (line+1)*(fi.descent + fi.ascent + fi.leading) , xx + 10000 } ;
                     CFStringRef mString = CFStringCreateWithBytes( NULL , (UInt8*) text + laststop , i - laststop , CFStringGetSystemEncoding(), false ) ;
+		            if ( m_backgroundMode != wxTRANSPARENT )
+		            {
+			            Point bounds={0,0} ;
+			            Rect background = frame ;
+			            SInt16 baseline ;
+			    		::GetThemeTextDimensions( mString,
+			    							kThemeCurrentPortFont,
+			    							kThemeStateActive,
+			    							false,
+			    							&bounds,
+			    							&baseline );
+			    		background.right = background.left + bounds.h ;
+			    		background.bottom = background.top + bounds.v ;
+			    		::EraseRect( &background ) ;
+		            }
             		::DrawThemeTextBox( mString,
             							kThemeCurrentPortFont,
             							kThemeStateActive,
@@ -1405,6 +1420,21 @@ void  wxDC::DoDrawText(const wxString& strtext, wxCoord x, wxCoord y)
     	{
     	    Rect frame = { yy + line*(fi.descent + fi.ascent + fi.leading)  ,xx , yy + (line+1)*(fi.descent + fi.ascent + fi.leading) , xx + 10000 } ;
             CFStringRef mString = CFStringCreateWithCString( NULL , text + laststop , kCFStringEncodingMacRoman ) ;
+            if ( m_backgroundMode != wxTRANSPARENT )
+            {
+	            Point bounds={0,0} ;
+	            Rect background = frame ;
+	            SInt16 baseline ;
+	    		::GetThemeTextDimensions( mString,
+	    							kThemeCurrentPortFont,
+	    							kThemeStateActive,
+	    							false,
+	    							&bounds,
+	    							&baseline );
+	    		background.right = background.left + bounds.h ;
+	    		background.bottom = background.top + bounds.v ;
+	    		::EraseRect( &background ) ;
+            }
     		::DrawThemeTextBox( mString,
     							kThemeCurrentPortFont,
     							kThemeStateActive,
diff --git a/src/mac/dc.cpp b/src/mac/dc.cpp
index 1d19d743cd..b0e3183298 100644
--- a/src/mac/dc.cpp
+++ b/src/mac/dc.cpp
@@ -1379,6 +1379,21 @@ void  wxDC::DoDrawText(const wxString& strtext, wxCoord x, wxCoord y)
             	{
     	            Rect frame = { yy + line*(fi.descent + fi.ascent + fi.leading)  ,xx , yy + (line+1)*(fi.descent + fi.ascent + fi.leading) , xx + 10000 } ;
                     CFStringRef mString = CFStringCreateWithBytes( NULL , (UInt8*) text + laststop , i - laststop , CFStringGetSystemEncoding(), false ) ;
+		            if ( m_backgroundMode != wxTRANSPARENT )
+		            {
+			            Point bounds={0,0} ;
+			            Rect background = frame ;
+			            SInt16 baseline ;
+			    		::GetThemeTextDimensions( mString,
+			    							kThemeCurrentPortFont,
+			    							kThemeStateActive,
+			    							false,
+			    							&bounds,
+			    							&baseline );
+			    		background.right = background.left + bounds.h ;
+			    		background.bottom = background.top + bounds.v ;
+			    		::EraseRect( &background ) ;
+		            }
             		::DrawThemeTextBox( mString,
             							kThemeCurrentPortFont,
             							kThemeStateActive,
@@ -1405,6 +1420,21 @@ void  wxDC::DoDrawText(const wxString& strtext, wxCoord x, wxCoord y)
     	{
     	    Rect frame = { yy + line*(fi.descent + fi.ascent + fi.leading)  ,xx , yy + (line+1)*(fi.descent + fi.ascent + fi.leading) , xx + 10000 } ;
             CFStringRef mString = CFStringCreateWithCString( NULL , text + laststop , kCFStringEncodingMacRoman ) ;
+            if ( m_backgroundMode != wxTRANSPARENT )
+            {
+	            Point bounds={0,0} ;
+	            Rect background = frame ;
+	            SInt16 baseline ;
+	    		::GetThemeTextDimensions( mString,
+	    							kThemeCurrentPortFont,
+	    							kThemeStateActive,
+	    							false,
+	    							&bounds,
+	    							&baseline );
+	    		background.right = background.left + bounds.h ;
+	    		background.bottom = background.top + bounds.v ;
+	    		::EraseRect( &background ) ;
+            }
     		::DrawThemeTextBox( mString,
     							kThemeCurrentPortFont,
     							kThemeStateActive,