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

fixed inserting styled text into an empty control under GTK+ 2.0

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@28435 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2004-07-23 19:59:00 +00:00
parent 7ff64980aa
commit c04ec49657
4 changed files with 70 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
src/gtk/textctrl.cpp
View File

@@ -155,7 +155,9 @@ gtk_text_changed_callback( GtkWidget *widget, wxTextCtrl *win )
wxapp_install_idle_handler();
win->SetModified();
#ifndef __WXGTK20__
win->UpdateFontIfNeeded();
#endif // !__WXGTK20__
wxCommandEvent event( wxEVT_COMMAND_TEXT_UPDATED, win->GetId() );
event.SetEventObject( win );
@@ -239,7 +241,7 @@ void wxTextCtrl::Init()
{
m_ignoreNextUpdate =
m_modified = FALSE;
m_updateFont = FALSE;
SetUpdateFont(FALSE);
m_text =
m_vScrollbar = (GtkWidget *)NULL;
}
@@ -577,6 +579,11 @@ void wxTextCtrl::WriteText( const wxString &text )
if ( text.empty() )
return;
// gtk_text_changed_callback() will set m_modified to true but m_modified
// shouldn't be changed by the program writing to the text control itself,
// so save the old value and restore when we're done
bool oldModified = m_modified;
if ( m_windowStyle & wxTE_MULTILINE )
{
#ifdef __WXGTK20__
@@ -612,7 +619,7 @@ void wxTextCtrl::WriteText( const wxString &text )
// in UpdateFontIfNeeded() any longer
if ( !text.empty() )
{
m_updateFont = FALSE;
SetUpdateFont(FALSE);
}
// Bring editable's cursor back uptodate.
@@ -644,7 +651,7 @@ void wxTextCtrl::WriteText( const wxString &text )
gtk_entry_set_position( GTK_ENTRY(m_text), len );
}
m_modified = TRUE;
m_modified = oldModified;
}
void wxTextCtrl::AppendText( const wxString &text )
@@ -1401,7 +1408,7 @@ bool wxTextCtrl::SetFont( const wxFont &font )
if ( m_windowStyle & wxTE_MULTILINE )
{
m_updateFont = TRUE;
SetUpdateFont(TRUE);
m_defaultStyle.SetFont(font);
@@ -1415,25 +1422,35 @@ void wxTextCtrl::ChangeFontGlobally()
{
// this method is very inefficient and hence should be called as rarely as
// possible!
wxASSERT_MSG( (m_windowStyle & wxTE_MULTILINE) && m_updateFont,
//
// TODO: it can be implemented much more efficiently for GTK2
wxASSERT_MSG( (m_windowStyle & wxTE_MULTILINE)
#ifndef __WXGTK20__
&& m_updateFont
#endif // GTK+ 1.x
,
_T("shouldn't be called for single line controls") );
wxString value = GetValue();
if ( !value.IsEmpty() )
{
m_updateFont = FALSE;
SetUpdateFont(FALSE);
Clear();
AppendText(value);
}
}
#ifndef __WXGTK20__
void wxTextCtrl::UpdateFontIfNeeded()
{
if ( m_updateFont )
ChangeFontGlobally();
}
#endif // GTK+ 1.x
bool wxTextCtrl::SetForegroundColour(const wxColour& colour)
{
if ( !wxControl::SetForegroundColour(colour) )