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

respect the current default style in SetValue() (modified patch 1684613)

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@45048 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2007-03-25 01:30:46 +00:00
parent 8639b30da1
commit 785d8330bb
1 changed files with 15 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/gtk/textctrl.cpp
View File

@@ -1003,7 +1003,13 @@ void wxTextCtrl::DoSetValue( const wxString &value, int flags )
m_modified = false; m_modified = false;
DontMarkDirtyOnNextChange(); DontMarkDirtyOnNextChange();
const wxCharBuffer buffer(wxGTK_CONV_ENC(value, GetTextEncoding())); wxFontEncoding enc = m_defaultStyle.HasFont()
? m_defaultStyle.GetFont().GetEncoding()
: wxFONTENCODING_SYSTEM;
if ( enc == wxFONTENCODING_SYSTEM )
enc = GetTextEncoding();
const wxCharBuffer buffer(wxGTK_CONV_ENC(value, enc));
if ( !buffer ) if ( !buffer )
{ {
// see comment in WriteText() as to why we must warn the user about // see comment in WriteText() as to why we must warn the user about
@@ -1024,6 +1030,14 @@ void wxTextCtrl::DoSetValue( const wxString &value, int flags )
if ( IsMultiLine() ) if ( IsMultiLine() )
{ {
gtk_text_buffer_set_text( m_buffer, buffer, strlen(buffer) ); gtk_text_buffer_set_text( m_buffer, buffer, strlen(buffer) );
if ( !m_defaultStyle.IsDefault() )
{
GtkTextIter start, end;
gtk_text_buffer_get_bounds( m_buffer, &start, &end );
wxGtkTextApplyTagsFromAttr(m_widget, m_buffer, m_defaultStyle,
&start, &end);
}
} }
else // single line else // single line
{ {