AuroraMiddleware/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

unicode fixes

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19852 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Stefan Csomor 2003-03-28 17:30:20 +00:00
parent 84e7f94cb0
commit 2c1a331259
6 changed files with 56 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/mac/carbon/choice.cpp
View File

@ -238,7 +238,20 @@ wxSize wxChoice::DoGetBestSize() const
// Find the widest line
for(int i = 0; i < GetCount(); i++) {
wxString str(GetString(i));
wLine = ::TextWidth( str.c_str() , 0 , str.Length() ) ;
#if wxUSE_UNICODE
Point bounds={0,0} ;
SInt16 baseline ;
::GetThemeTextDimensions( wxMacCFStringHolder( str ) ,
kThemeCurrentPortFont,
kThemeStateActive,
false,
&bounds,
&baseline );
wLine = bounds.h ;
#else
wxCharBuffer text = wxMacStringToCString( str ) ;
wLine = ::TextWidth( text , 0 , strlen(text) ) ;
#endif
lbWidth = wxMax(lbWidth, wLine);
}
// Add room for the popup arrow

15
src/mac/carbon/listbox.cpp
View File

@ -620,7 +620,20 @@ wxSize wxListBox::DoGetBestSize() const
// Find the widest line
for(int i = 0; i < GetCount(); i++) {
wxString str(GetString(i));
wLine = ::TextWidth( str.c_str() , 0 , str.Length() ) ;
#if wxUSE_UNICODE
Point bounds={0,0} ;
SInt16 baseline ;
::GetThemeTextDimensions( wxMacCFStringHolder( str ) ,
kThemeCurrentPortFont,
kThemeStateActive,
false,
&bounds,
&baseline );
wLine = bounds.h ;
#else
wxCharBuffer text = wxMacStringToCString( str ) ;
wLine = ::TextWidth( text , 0 , strlen(text) ) ;
#endif
lbWidth = wxMax(lbWidth, wLine);
}

1
src/mac/carbon/tooltip.cpp
View File

@ -256,7 +256,6 @@ void wxMacToolTip::Draw()
::GetFontInfo(&fontInfo);
short lineh = fontInfo.ascent + fontInfo.descent + fontInfo.leading;
short height = 0 ;
// short width = TextWidth( m_label , 0 ,m_label.Length() ) ;
int i = 0 ;
int length = m_label.Length() ;

15
src/mac/choice.cpp
View File

@ -238,7 +238,20 @@ wxSize wxChoice::DoGetBestSize() const
// Find the widest line
for(int i = 0; i < GetCount(); i++) {
wxString str(GetString(i));
wLine = ::TextWidth( str.c_str() , 0 , str.Length() ) ;
#if wxUSE_UNICODE
Point bounds={0,0} ;
SInt16 baseline ;
::GetThemeTextDimensions( wxMacCFStringHolder( str ) ,
kThemeCurrentPortFont,
kThemeStateActive,
false,
&bounds,
&baseline );
wLine = bounds.h ;
#else
wxCharBuffer text = wxMacStringToCString( str ) ;
wLine = ::TextWidth( text , 0 , strlen(text) ) ;
#endif
lbWidth = wxMax(lbWidth, wLine);
}
// Add room for the popup arrow

15
src/mac/listbox.cpp
View File

@ -620,7 +620,20 @@ wxSize wxListBox::DoGetBestSize() const
// Find the widest line
for(int i = 0; i < GetCount(); i++) {
wxString str(GetString(i));
wLine = ::TextWidth( str.c_str() , 0 , str.Length() ) ;
#if wxUSE_UNICODE
Point bounds={0,0} ;
SInt16 baseline ;
::GetThemeTextDimensions( wxMacCFStringHolder( str ) ,
kThemeCurrentPortFont,
kThemeStateActive,
false,
&bounds,
&baseline );
wLine = bounds.h ;
#else
wxCharBuffer text = wxMacStringToCString( str ) ;
wLine = ::TextWidth( text , 0 , strlen(text) ) ;
#endif
lbWidth = wxMax(lbWidth, wLine);
}

1
src/mac/tooltip.cpp
View File

@ -256,7 +256,6 @@ void wxMacToolTip::Draw()
::GetFontInfo(&fontInfo);
short lineh = fontInfo.ascent + fontInfo.descent + fontInfo.leading;
short height = 0 ;
// short width = TextWidth( m_label , 0 ,m_label.Length() ) ;
int i = 0 ;
int length = m_label.Length() ;