Applied patch [ 632115 ] Fixed internationalization on tooltips
wxMac's wxTooltip assumed that text was always PC encoded, and always converted the string using wxMacMakeMacStringFromPC(). This worked fine for English characters, but multi-byte encoded languages such as Japanese (SJIS) because garbled. I've added a check for "wxApp::s_macDefaultEncodingIsPC" before performing the conversion similar to other controls. Nilesh Agarwalla git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18150 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
parent
73145b0ed1
commit
678b263756
@ -190,7 +190,10 @@ void wxMacToolTip::Setup( WindowRef win , wxString text , wxPoint localPosition
|
||||
m_mark++ ;
|
||||
Clear() ;
|
||||
m_position = localPosition ;
|
||||
m_label = wxMacMakeMacStringFromPC( text ) ;
|
||||
if( wxApp::s_macDefaultEncodingIsPC )
|
||||
m_label = wxMacMakeMacStringFromPC( text ) ;
|
||||
else
|
||||
m_label = text ;
|
||||
m_window =win;
|
||||
s_ToolTipWindowRef = m_window ;
|
||||
m_backpict = NULL ;
|
||||
|
@ -190,7 +190,10 @@ void wxMacToolTip::Setup( WindowRef win , wxString text , wxPoint localPosition
|
||||
m_mark++ ;
|
||||
Clear() ;
|
||||
m_position = localPosition ;
|
||||
m_label = wxMacMakeMacStringFromPC( text ) ;
|
||||
if( wxApp::s_macDefaultEncodingIsPC )
|
||||
m_label = wxMacMakeMacStringFromPC( text ) ;
|
||||
else
|
||||
m_label = text ;
|
||||
m_window =win;
|
||||
s_ToolTipWindowRef = m_window ;
|
||||
m_backpict = NULL ;
|
||||
|
Loading…
Reference in New Issue
Block a user