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

corrected Appearance measuring routines

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

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

@@ -1635,13 +1635,14 @@ void wxDC::DoGetTextExtent( const wxString &string, wxCoord *width, wxCoord *he
if ( useGetThemeText ) if ( useGetThemeText )
{ {
Point bounds={0,0} ; Point bounds={0,0} ;
SInt16 baseline ;
CFStringRef mString = CFStringCreateWithBytes( NULL , (UInt8*) text + laststop , i - laststop , CFStringGetSystemEncoding(), false ) ; CFStringRef mString = CFStringCreateWithBytes( NULL , (UInt8*) text + laststop , i - laststop , CFStringGetSystemEncoding(), false ) ;
::GetThemeTextDimensions( mString, ::GetThemeTextDimensions( mString,
kThemeCurrentPortFont, kThemeCurrentPortFont,
kThemeStateActive, kThemeStateActive,
true, false,
&bounds, &bounds,
nil ); &baseline );
CFRelease( mString ) ; CFRelease( mString ) ;
curwidth = bounds.h ; curwidth = bounds.h ;
} }
@@ -1661,13 +1662,14 @@ void wxDC::DoGetTextExtent( const wxString &string, wxCoord *width, wxCoord *he
if ( useGetThemeText ) if ( useGetThemeText )
{ {
Point bounds={0,0} ; Point bounds={0,0} ;
SInt16 baseline ;
CFStringRef mString = CFStringCreateWithBytes( NULL , (UInt8*) text + laststop , i - laststop , CFStringGetSystemEncoding(), false ) ; CFStringRef mString = CFStringCreateWithBytes( NULL , (UInt8*) text + laststop , i - laststop , CFStringGetSystemEncoding(), false ) ;
::GetThemeTextDimensions( mString, ::GetThemeTextDimensions( mString,
kThemeCurrentPortFont, kThemeCurrentPortFont,
kThemeStateActive, kThemeStateActive,
true, false,
&bounds, &bounds,
nil ); &baseline );
CFRelease( mString ) ; CFRelease( mString ) ;
curwidth = bounds.h ; curwidth = bounds.h ;
} }

10
src/mac/dc.cpp
View File

@@ -1635,13 +1635,14 @@ void wxDC::DoGetTextExtent( const wxString &string, wxCoord *width, wxCoord *he
if ( useGetThemeText ) if ( useGetThemeText )
{ {
Point bounds={0,0} ; Point bounds={0,0} ;
SInt16 baseline ;
CFStringRef mString = CFStringCreateWithBytes( NULL , (UInt8*) text + laststop , i - laststop , CFStringGetSystemEncoding(), false ) ; CFStringRef mString = CFStringCreateWithBytes( NULL , (UInt8*) text + laststop , i - laststop , CFStringGetSystemEncoding(), false ) ;
::GetThemeTextDimensions( mString, ::GetThemeTextDimensions( mString,
kThemeCurrentPortFont, kThemeCurrentPortFont,
kThemeStateActive, kThemeStateActive,
true, false,
&bounds, &bounds,
nil ); &baseline );
CFRelease( mString ) ; CFRelease( mString ) ;
curwidth = bounds.h ; curwidth = bounds.h ;
} }
@@ -1661,13 +1662,14 @@ void wxDC::DoGetTextExtent( const wxString &string, wxCoord *width, wxCoord *he
if ( useGetThemeText ) if ( useGetThemeText )
{ {
Point bounds={0,0} ; Point bounds={0,0} ;
SInt16 baseline ;
CFStringRef mString = CFStringCreateWithBytes( NULL , (UInt8*) text + laststop , i - laststop , CFStringGetSystemEncoding(), false ) ; CFStringRef mString = CFStringCreateWithBytes( NULL , (UInt8*) text + laststop , i - laststop , CFStringGetSystemEncoding(), false ) ;
::GetThemeTextDimensions( mString, ::GetThemeTextDimensions( mString,
kThemeCurrentPortFont, kThemeCurrentPortFont,
kThemeStateActive, kThemeStateActive,
true, false,
&bounds, &bounds,
nil ); &baseline );
CFRelease( mString ) ; CFRelease( mString ) ;
curwidth = bounds.h ; curwidth = bounds.h ;
} }