block signal handlers, instead of disconnecting, to temporarily disable them

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@46982 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Paul Cornett
2007-06-27 17:38:13 +00:00
parent ab29bb87b2
commit 9826452012
6 changed files with 49 additions and 62 deletions

View File

@@ -1016,11 +1016,11 @@ void wxTextCtrl::DoSetValue( const wxString &value, int flags )
return;
}
void* blockWidget = IsMultiLine() ? (void*)m_buffer : (void*)m_text;
g_signal_handlers_block_by_func(blockWidget,
(gpointer)gtk_text_changed_callback, this);
if ( IsMultiLine() )
{
g_signal_handlers_disconnect_by_func (m_buffer,
(gpointer) gtk_text_changed_callback, this);
gtk_text_buffer_set_text( m_buffer, buffer, strlen(buffer) );
if ( !m_defaultStyle.IsDefault() )
@@ -1030,20 +1030,13 @@ void wxTextCtrl::DoSetValue( const wxString &value, int flags )
wxGtkTextApplyTagsFromAttr(m_widget, m_buffer, m_defaultStyle,
&start, &end);
}
g_signal_connect (m_buffer, "changed",
G_CALLBACK (gtk_text_changed_callback), this);
}
else
{
g_signal_handlers_disconnect_by_func (m_text,
(gpointer) gtk_text_changed_callback, this);
gtk_entry_set_text( GTK_ENTRY(m_text), buffer );
g_signal_connect (m_text, "changed",
G_CALLBACK (gtk_text_changed_callback), this);
}
g_signal_handlers_unblock_by_func(blockWidget,
(gpointer)gtk_text_changed_callback, this);
// This was added after discussion on the list
SetInsertionPoint(0);