PyCrust updates from their CVS.

[wxWidgets.git] / src / mac / dc.cpp

diff --git a/src/mac/dc.cpp b/src/mac/dc.cpp
index eb2bc13dc4bdd2af82fe8e85a7d679b801e67895..364c45fcf105dd6edc3f61dd797a38dfdb77d370 100644 (file)
--- 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 ) ;
        long yy = YLOG2DEVMAC(y);
 #if TARGET_CARBON
        bool useDrawThemeText = ( DrawThemeTextBox != (void*) kUnresolvedCFragSymbolAddress ) ;

+       useDrawThemeText = false ;

 #endif
        MacInstallFont() ;
     if ( 0 )
 #endif
        MacInstallFont() ;
     if ( 0 )


@@ -1525,7 +1526,7 @@ void  wxDC::DoDrawText(const wxString& strtext, wxCoord x, wxCoord y)
                        ::DrawThemeTextBox( mString,
                                                                kThemeCurrentPortFont,
                                                                kThemeStateActive,
                        ::DrawThemeTextBox( mString,
                                                                kThemeCurrentPortFont,
                                                                kThemeStateActive,

-                                                               true,
+                                                               false,

                                                                &frame,
                                                                teJustLeft,
                                                                nil );
                                                                &frame,
                                                                teJustLeft,
                                                                nil );


@@ -1551,7 +1552,7 @@ void  wxDC::DoDrawText(const wxString& strtext, wxCoord x, wxCoord y)
                ::DrawThemeTextBox( mString,
                                                        kThemeCurrentPortFont,
                                                        kThemeStateActive,
                ::DrawThemeTextBox( mString,
                                                        kThemeCurrentPortFont,
                                                        kThemeStateActive,

-                                                       true,
+                                                       false,

                                                        &frame,
                                                        teJustLeft,
                                                        nil );
                                                        &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 ) ;
        ::GetFontInfo( &fi ) ;
 #if TARGET_CARBON      
        bool useGetThemeText = ( GetThemeTextDimensions != (void*) kUnresolvedCFragSymbolAddress ) ;

+       useGetThemeText = false ;

 #endif
 
        if ( height )
 #endif
 
        if ( height )