Support encodings in wxGTK_CONV_BACK() in the same way as we do it in

wxGTK_CONV(), i.e. return the string containing text in ISO-8859-1 encoding
and not UTF-8 if the controls font was set to have ISO-8859-1 encoding


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@44577 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2007-02-27 15:41:56 +00:00
parent c0da0dbabf
commit 30083ad8e7
7 changed files with 59 additions and 22 deletions

View File

@@ -1547,8 +1547,9 @@ static wxString GetGtkHotKey( const wxMenuItem& item )
default:
if ( code < 127 )
{
wxString name = wxGTK_CONV_BACK( gdk_keyval_name((guint)code) );
if ( name )
const wxString
name = wxGTK_CONV_BACK_SYS(gdk_keyval_name((guint)code));
if ( !name.empty() )
{
hotkey << name;
break;