Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

switch back to non appearance fonts until problems are solved

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@15914 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Stefan Csomor
2002-06-21 18:54:40 +00:00
parent 45c8d9e52a
commit b2a0801592
2 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/mac/carbon/dc.cpp
View File

@@ -1464,6 +1464,7 @@ void wxDC::DoDrawText(const wxString& strtext, wxCoord x, wxCoord y)
long yy = YLOG2DEVMAC(y); long yy = YLOG2DEVMAC(y);
#if TARGET_CARBON #if TARGET_CARBON
bool useDrawThemeText = ( DrawThemeTextBox != (void*) kUnresolvedCFragSymbolAddress ) ; bool useDrawThemeText = ( DrawThemeTextBox != (void*) kUnresolvedCFragSymbolAddress ) ;
useDrawThemeText = false ;
#endif #endif
MacInstallFont() ; MacInstallFont() ;
if ( 0 ) if ( 0 )
@@ -1525,7 +1526,7 @@ void wxDC::DoDrawText(const wxString& strtext, wxCoord x, wxCoord y)
::DrawThemeTextBox( mString, ::DrawThemeTextBox( mString,
kThemeCurrentPortFont, kThemeCurrentPortFont,
kThemeStateActive, kThemeStateActive,
true, false,
&frame, &frame,
teJustLeft, teJustLeft,
nil ); nil );
@@ -1551,7 +1552,7 @@ void wxDC::DoDrawText(const wxString& strtext, wxCoord x, wxCoord y)
::DrawThemeTextBox( mString, ::DrawThemeTextBox( mString,
kThemeCurrentPortFont, kThemeCurrentPortFont,
kThemeStateActive, kThemeStateActive,
true, false,
&frame, &frame,
teJustLeft, teJustLeft,
nil ); nil );
@@ -1594,6 +1595,7 @@ void wxDC::DoGetTextExtent( const wxString &string, wxCoord *width, wxCoord *he
::GetFontInfo( &fi ) ; ::GetFontInfo( &fi ) ;
#if TARGET_CARBON #if TARGET_CARBON
bool useGetThemeText = ( GetThemeTextDimensions != (void*) kUnresolvedCFragSymbolAddress ) ; bool useGetThemeText = ( GetThemeTextDimensions != (void*) kUnresolvedCFragSymbolAddress ) ;
useGetThemeText = false ;
#endif #endif
if ( height ) if ( height )

6
src/mac/dc.cpp
View File

@@ -1464,6 +1464,7 @@ void wxDC::DoDrawText(const wxString& strtext, wxCoord x, wxCoord y)
long yy = YLOG2DEVMAC(y); long yy = YLOG2DEVMAC(y);
#if TARGET_CARBON #if TARGET_CARBON
bool useDrawThemeText = ( DrawThemeTextBox != (void*) kUnresolvedCFragSymbolAddress ) ; bool useDrawThemeText = ( DrawThemeTextBox != (void*) kUnresolvedCFragSymbolAddress ) ;
useDrawThemeText = false ;
#endif #endif
MacInstallFont() ; MacInstallFont() ;
if ( 0 ) if ( 0 )
@@ -1525,7 +1526,7 @@ void wxDC::DoDrawText(const wxString& strtext, wxCoord x, wxCoord y)
::DrawThemeTextBox( mString, ::DrawThemeTextBox( mString,
kThemeCurrentPortFont, kThemeCurrentPortFont,
kThemeStateActive, kThemeStateActive,
true, false,
&frame, &frame,
teJustLeft, teJustLeft,
nil ); nil );
@@ -1551,7 +1552,7 @@ void wxDC::DoDrawText(const wxString& strtext, wxCoord x, wxCoord y)
::DrawThemeTextBox( mString, ::DrawThemeTextBox( mString,
kThemeCurrentPortFont, kThemeCurrentPortFont,
kThemeStateActive, kThemeStateActive,
true, false,
&frame, &frame,
teJustLeft, teJustLeft,
nil ); nil );
@@ -1594,6 +1595,7 @@ void wxDC::DoGetTextExtent( const wxString &string, wxCoord *width, wxCoord *he
::GetFontInfo( &fi ) ; ::GetFontInfo( &fi ) ;
#if TARGET_CARBON #if TARGET_CARBON
bool useGetThemeText = ( GetThemeTextDimensions != (void*) kUnresolvedCFragSymbolAddress ) ; bool useGetThemeText = ( GetThemeTextDimensions != (void*) kUnresolvedCFragSymbolAddress ) ;
useGetThemeText = false ;
#endif #endif
if ( height ) if ( height )