From: Stefan Csomor <csomor@advancedconcepts.ch>
Date: Fri, 21 Jun 2002 18:54:40 +0000 (+0000)
Subject: switch back to non appearance fonts until problems are solved
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/b2a0801592284a074235c5e8f1c9987e873d6ba4

switch back to non appearance fonts until problems are solved


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

diff --git a/src/mac/carbon/dc.cpp b/src/mac/carbon/dc.cpp
index eb2bc13dc4..364c45fcf1 100644
--- a/src/mac/carbon/dc.cpp
+++ b/src/mac/carbon/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 )
diff --git a/src/mac/dc.cpp b/src/mac/dc.cpp
index eb2bc13dc4..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 )