disabling anti-aliasing in carbon builds running under classic (performance)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23533 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
parent
789a620add
commit
b7047aa5cb
@ -1403,9 +1403,8 @@ void wxDC::DoDrawText(const wxString& strtext, wxCoord x, wxCoord y)
|
|||||||
long xx = XLOG2DEVMAC(x);
|
long xx = XLOG2DEVMAC(x);
|
||||||
long yy = YLOG2DEVMAC(y);
|
long yy = YLOG2DEVMAC(y);
|
||||||
#if TARGET_CARBON
|
#if TARGET_CARBON
|
||||||
|
|
||||||
bool useDrawThemeText = ( DrawThemeTextBox != (void*) kUnresolvedCFragSymbolAddress ) ;
|
bool useDrawThemeText = ( DrawThemeTextBox != (void*) kUnresolvedCFragSymbolAddress ) ;
|
||||||
if ( IsKindOf(CLASSINFO( wxPrinterDC ) ) || m_font.GetNoAntiAliasing() )
|
if ( UMAGetSystemVersion() < 0x1000 || IsKindOf(CLASSINFO( wxPrinterDC ) ) || m_font.GetNoAntiAliasing() )
|
||||||
useDrawThemeText = false ;
|
useDrawThemeText = false ;
|
||||||
#endif
|
#endif
|
||||||
MacInstallFont() ;
|
MacInstallFont() ;
|
||||||
@ -1545,7 +1544,7 @@ void wxDC::DoGetTextExtent( const wxString &strtext, wxCoord *width, wxCoord *h
|
|||||||
::GetFontInfo( &fi ) ;
|
::GetFontInfo( &fi ) ;
|
||||||
#if TARGET_CARBON
|
#if TARGET_CARBON
|
||||||
bool useGetThemeText = ( GetThemeTextDimensions != (void*) kUnresolvedCFragSymbolAddress ) ;
|
bool useGetThemeText = ( GetThemeTextDimensions != (void*) kUnresolvedCFragSymbolAddress ) ;
|
||||||
if ( IsKindOf(CLASSINFO( wxPrinterDC ) ) || ((wxFont*)&m_font)->GetNoAntiAliasing() )
|
if ( UMAGetSystemVersion() < 0x1000 || IsKindOf(CLASSINFO( wxPrinterDC ) ) || ((wxFont*)&m_font)->GetNoAntiAliasing() )
|
||||||
useGetThemeText = false ;
|
useGetThemeText = false ;
|
||||||
#endif
|
#endif
|
||||||
if ( height )
|
if ( height )
|
||||||
@ -1650,7 +1649,7 @@ wxCoord wxDC::GetCharWidth(void) const
|
|||||||
int width = 0 ;
|
int width = 0 ;
|
||||||
#if TARGET_CARBON
|
#if TARGET_CARBON
|
||||||
bool useGetThemeText = ( GetThemeTextDimensions != (void*) kUnresolvedCFragSymbolAddress ) ;
|
bool useGetThemeText = ( GetThemeTextDimensions != (void*) kUnresolvedCFragSymbolAddress ) ;
|
||||||
if ( ((wxFont*)&m_font)->GetNoAntiAliasing() )
|
if ( UMAGetSystemVersion() < 0x1000 || ((wxFont*)&m_font)->GetNoAntiAliasing() )
|
||||||
useGetThemeText = false ;
|
useGetThemeText = false ;
|
||||||
#endif
|
#endif
|
||||||
char text[] = "H" ;
|
char text[] = "H" ;
|
||||||
|
@ -1403,9 +1403,8 @@ void wxDC::DoDrawText(const wxString& strtext, wxCoord x, wxCoord y)
|
|||||||
long xx = XLOG2DEVMAC(x);
|
long xx = XLOG2DEVMAC(x);
|
||||||
long yy = YLOG2DEVMAC(y);
|
long yy = YLOG2DEVMAC(y);
|
||||||
#if TARGET_CARBON
|
#if TARGET_CARBON
|
||||||
|
|
||||||
bool useDrawThemeText = ( DrawThemeTextBox != (void*) kUnresolvedCFragSymbolAddress ) ;
|
bool useDrawThemeText = ( DrawThemeTextBox != (void*) kUnresolvedCFragSymbolAddress ) ;
|
||||||
if ( IsKindOf(CLASSINFO( wxPrinterDC ) ) || m_font.GetNoAntiAliasing() )
|
if ( UMAGetSystemVersion() < 0x1000 || IsKindOf(CLASSINFO( wxPrinterDC ) ) || m_font.GetNoAntiAliasing() )
|
||||||
useDrawThemeText = false ;
|
useDrawThemeText = false ;
|
||||||
#endif
|
#endif
|
||||||
MacInstallFont() ;
|
MacInstallFont() ;
|
||||||
@ -1545,7 +1544,7 @@ void wxDC::DoGetTextExtent( const wxString &strtext, wxCoord *width, wxCoord *h
|
|||||||
::GetFontInfo( &fi ) ;
|
::GetFontInfo( &fi ) ;
|
||||||
#if TARGET_CARBON
|
#if TARGET_CARBON
|
||||||
bool useGetThemeText = ( GetThemeTextDimensions != (void*) kUnresolvedCFragSymbolAddress ) ;
|
bool useGetThemeText = ( GetThemeTextDimensions != (void*) kUnresolvedCFragSymbolAddress ) ;
|
||||||
if ( IsKindOf(CLASSINFO( wxPrinterDC ) ) || ((wxFont*)&m_font)->GetNoAntiAliasing() )
|
if ( UMAGetSystemVersion() < 0x1000 || IsKindOf(CLASSINFO( wxPrinterDC ) ) || ((wxFont*)&m_font)->GetNoAntiAliasing() )
|
||||||
useGetThemeText = false ;
|
useGetThemeText = false ;
|
||||||
#endif
|
#endif
|
||||||
if ( height )
|
if ( height )
|
||||||
@ -1650,7 +1649,7 @@ wxCoord wxDC::GetCharWidth(void) const
|
|||||||
int width = 0 ;
|
int width = 0 ;
|
||||||
#if TARGET_CARBON
|
#if TARGET_CARBON
|
||||||
bool useGetThemeText = ( GetThemeTextDimensions != (void*) kUnresolvedCFragSymbolAddress ) ;
|
bool useGetThemeText = ( GetThemeTextDimensions != (void*) kUnresolvedCFragSymbolAddress ) ;
|
||||||
if ( ((wxFont*)&m_font)->GetNoAntiAliasing() )
|
if ( UMAGetSystemVersion() < 0x1000 || ((wxFont*)&m_font)->GetNoAntiAliasing() )
|
||||||
useGetThemeText = false ;
|
useGetThemeText = false ;
|
||||||
#endif
|
#endif
|
||||||
char text[] = "H" ;
|
char text[] = "H" ;
|
||||||
|
Loading…
Reference in New Issue
Block a user