X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/f52640f373f873596bdcd99bd5a1876965616bd3..2a5c221c19ed623f60d5130e5592409a95bcf2f4:/src/mac/dc.cpp

diff --git a/src/mac/dc.cpp b/src/mac/dc.cpp
index d5f9cbac2b..364c45fcf1 100644
--- a/src/mac/dc.cpp
+++ b/src/mac/dc.cpp
@@ -1464,6 +1464,7 @@ void  wxDC::DoDrawText(const wxString& strtext, wxCoord x, wxCoord y)
 	long yy = YLOG2DEVMAC(y);
 #if TARGET_CARBON
 	bool useDrawThemeText = ( DrawThemeTextBox != (void*) kUnresolvedCFragSymbolAddress ) ;
+	useDrawThemeText = false ;
 #endif
 	MacInstallFont() ;
     if ( 0 )
@@ -1525,7 +1526,7 @@ void  wxDC::DoDrawText(const wxString& strtext, wxCoord x, wxCoord y)
             		::DrawThemeTextBox( mString,
             							kThemeCurrentPortFont,
             							kThemeStateActive,
-            							true,
+            							false,
             							&frame,
             							teJustLeft,
             							nil );
@@ -1551,7 +1552,7 @@ void  wxDC::DoDrawText(const wxString& strtext, wxCoord x, wxCoord y)
     		::DrawThemeTextBox( mString,
     							kThemeCurrentPortFont,
     							kThemeStateActive,
-    							true,
+    							false,
     							&frame,
     							teJustLeft,
     							nil );
@@ -1594,6 +1595,7 @@ void  wxDC::DoGetTextExtent( const wxString &string, wxCoord *width, wxCoord *he
 	::GetFontInfo( &fi ) ;
 #if TARGET_CARBON	
 	bool useGetThemeText = ( GetThemeTextDimensions != (void*) kUnresolvedCFragSymbolAddress ) ;
+	useGetThemeText = false ;
 #endif
 
 	if ( height )
@@ -1635,13 +1637,14 @@ void  wxDC::DoGetTextExtent( const wxString &string, wxCoord *width, wxCoord *he
                 if ( useGetThemeText )
                 {
                     Point bounds={0,0} ;
+                    SInt16 baseline ;
                     CFStringRef mString = CFStringCreateWithBytes( NULL , (UInt8*) text + laststop , i - laststop , CFStringGetSystemEncoding(), false ) ;
             		::GetThemeTextDimensions( mString,
             							kThemeCurrentPortFont,
             							kThemeStateActive,
-            							true,
+            							false,
             							&bounds,
-            							nil );
+            							&baseline );
             	    CFRelease( mString ) ;
             	    curwidth = bounds.h ;
                 }
@@ -1661,13 +1664,14 @@ void  wxDC::DoGetTextExtent( const wxString &string, wxCoord *width, wxCoord *he
         if ( useGetThemeText )
         {
             Point bounds={0,0} ;
+            SInt16 baseline ;
             CFStringRef mString = CFStringCreateWithBytes( NULL , (UInt8*) text + laststop , i - laststop , CFStringGetSystemEncoding(), false ) ;
     		::GetThemeTextDimensions( mString,
     							kThemeCurrentPortFont,
     							kThemeStateActive,
-    							true,
+    							false,
     							&bounds,
-    							nil );
+    							&baseline );
     	    CFRelease( mString ) ;
     	    curwidth = bounds.h ;
         }