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

Don't use font encoding in Unicode mode

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@53735 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robert Roebling
2008-05-24 19:16:47 +00:00
parent 997c7e4616
commit d5d20078e0
1 changed files with 8 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/gtk/textctrl.cpp
View File

@@ -968,6 +968,9 @@ void wxTextCtrl::DoSetValue( const wxString &value, int flags )
return; return;
} }
#ifdef wxUSE_UNICODE
const wxCharBuffer buffer(value.utf8_str());
#else
wxFontEncoding enc = m_defaultStyle.HasFont() wxFontEncoding enc = m_defaultStyle.HasFont()
? m_defaultStyle.GetFont().GetEncoding() ? m_defaultStyle.GetFont().GetEncoding()
: wxFONTENCODING_SYSTEM; : wxFONTENCODING_SYSTEM;
@@ -982,6 +985,7 @@ void wxTextCtrl::DoSetValue( const wxString &value, int flags )
wxLogWarning(_("Failed to set text in the text control.")); wxLogWarning(_("Failed to set text in the text control."));
return; return;
} }
#endif
if ( !(flags & SetValue_SendEvent) ) if ( !(flags & SetValue_SendEvent) )
{ {
@@ -1020,6 +1024,9 @@ void wxTextCtrl::WriteText( const wxString &text )
return; return;
} }
#ifdef wxUSE_UNICODE
const wxCharBuffer buffer(text.utf8_str());
#else
// check if we have a specific style for the current position // check if we have a specific style for the current position
wxFontEncoding enc = wxFONTENCODING_SYSTEM; wxFontEncoding enc = wxFONTENCODING_SYSTEM;
wxTextAttr style; wxTextAttr style;
@@ -1040,6 +1047,7 @@ void wxTextCtrl::WriteText( const wxString &text )
wxLogWarning(_("Failed to insert text in the control.")); wxLogWarning(_("Failed to insert text in the control."));
return; return;
} }
#endif
// First remove the selection if there is one // First remove the selection if there is one
// TODO: Is there an easier GTK specific way to do this? // TODO: Is there an easier GTK specific way to do this?