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

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

Browse Source 
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
Download Patch File Download Diff File Expand all files Collapse all files

45
src/gtk/combobox.cpp
View File

@@ -132,12 +132,12 @@ gtkcombo_combo_select_child_callback( GtkList *WXUNUSED(list), GtkWidget *WXUNUS
// Quickly set the value of the combo box // Quickly set the value of the combo box
// as GTK+ does that only AFTER the event // as GTK+ does that only AFTER the event
// is sent. // is sent.
g_signal_handlers_disconnect_by_func (GTK_COMBO (combo->GetHandle())->entry, GtkWidget* entry = GTK_COMBO(combo->GetHandle())->entry;
(gpointer) gtkcombo_text_changed_callback, g_signal_handlers_block_by_func(
combo); entry, (gpointer)gtkcombo_text_changed_callback, combo);
combo->SetValue( combo->GetStringSelection() ); combo->SetValue( combo->GetStringSelection() );
g_signal_connect_after (GTK_COMBO (combo->GetHandle())->entry, "changed", g_signal_handlers_unblock_by_func(
G_CALLBACK (gtkcombo_text_changed_callback), combo); entry, (gpointer)gtkcombo_text_changed_callback, combo);
// throw a SELECTED event only if the combobox popup is hidden (wxID_NONE) // throw a SELECTED event only if the combobox popup is hidden (wxID_NONE)
// because when combobox popup is shown, gtkcombo_combo_select_child_callback is // because when combobox popup is shown, gtkcombo_combo_select_child_callback is
@@ -1214,20 +1214,20 @@ void wxComboBox::DisableEvents()
#ifdef __WXGTK24__ #ifdef __WXGTK24__
if (!gtk_check_version(2,4,0)) if (!gtk_check_version(2,4,0))
{ {
g_signal_handlers_disconnect_by_func (GTK_BIN(m_widget)->child, g_signal_handlers_block_by_func(GTK_BIN(m_widget)->child,
(gpointer)gtkcombobox_text_changed_callback, this); (gpointer)gtkcombobox_text_changed_callback, this);
g_signal_handlers_disconnect_by_func (m_widget, g_signal_handlers_block_by_func(m_widget,
(gpointer)gtkcombobox_changed_callback, this); (gpointer)gtkcombobox_changed_callback, this);
} }
else else
#endif #endif
{ {
g_signal_handlers_disconnect_by_func (GTK_COMBO(m_widget)->list, g_signal_handlers_block_by_func(GTK_COMBO(m_widget)->list,
(gpointer) gtkcombo_combo_select_child_callback, this); (gpointer) gtkcombo_combo_select_child_callback, this);
g_signal_handlers_disconnect_by_func (GTK_COMBO(m_widget)->entry, g_signal_handlers_block_by_func(GTK_COMBO(m_widget)->entry,
(gpointer) gtkcombo_text_changed_callback, this); (gpointer) gtkcombo_text_changed_callback, this);
} }
} }
@@ -1236,21 +1236,20 @@ void wxComboBox::EnableEvents()
#ifdef __WXGTK24__ #ifdef __WXGTK24__
if (!gtk_check_version(2,4,0)) if (!gtk_check_version(2,4,0))
{ {
g_signal_connect_after (GTK_BIN(m_widget)->child, "changed", g_signal_handlers_unblock_by_func(GTK_BIN(m_widget)->child,
G_CALLBACK (gtkcombobox_text_changed_callback), this); (gpointer)gtkcombobox_text_changed_callback, this);
g_signal_connect_after (m_widget, "changed", g_signal_handlers_unblock_by_func(m_widget,
G_CALLBACK (gtkcombobox_changed_callback), this); (gpointer)gtkcombobox_changed_callback, this);
} }
else else
#endif #endif
{ {
g_signal_connect_after (GTK_COMBO(m_widget)->list, "select-child", g_signal_handlers_unblock_by_func(GTK_COMBO(m_widget)->list,
G_CALLBACK (gtkcombo_combo_select_child_callback), (gpointer) gtkcombo_combo_select_child_callback, this);
this);
g_signal_connect_after (GTK_COMBO(m_widget)->entry, "changed", g_signal_handlers_unblock_by_func(GTK_COMBO(m_widget)->entry,
G_CALLBACK (gtkcombo_text_changed_callback), (gpointer) gtkcombo_text_changed_callback, this);
this );
} }
} }

20
src/gtk/notebook.cpp
View File

@@ -294,26 +294,22 @@ int wxNotebook::DoSetSelection( size_t page, int flags )
if ( !(flags & SetSelection_SendEvent) ) if ( !(flags & SetSelection_SendEvent) )
{ {
g_signal_handlers_disconnect_by_func (m_widget, g_signal_handlers_block_by_func(m_widget,
(gpointer) gtk_notebook_page_changing_callback, (gpointer)gtk_notebook_page_changing_callback, this);
this);
g_signal_handlers_disconnect_by_func (m_widget, g_signal_handlers_block_by_func(m_widget,
(gpointer) gtk_notebook_page_changed_callback, (gpointer)gtk_notebook_page_changed_callback, this);
this);
} }
gtk_notebook_set_current_page( GTK_NOTEBOOK(m_widget), page ); gtk_notebook_set_current_page( GTK_NOTEBOOK(m_widget), page );
if ( !(flags & SetSelection_SendEvent) ) if ( !(flags & SetSelection_SendEvent) )
{ {
// reconnect to signals g_signal_handlers_unblock_by_func(m_widget,
(gpointer)gtk_notebook_page_changing_callback, this);
g_signal_connect (m_widget, "switch_page", g_signal_handlers_unblock_by_func(m_widget,
G_CALLBACK (gtk_notebook_page_changing_callback), this); (gpointer)gtk_notebook_page_changed_callback, this);
g_signal_connect_after (m_widget, "switch_page",
G_CALLBACK (gtk_notebook_page_changed_callback), this);
} }
wxNotebookPage *client = GetPage(page); wxNotebookPage *client = GetPage(page);

9
src/gtk/radiobox.cpp
View File

@@ -555,9 +555,8 @@ void wxRadioBox::GtkDisableEvents()
wxRadioBoxButtonsInfoList::compatibility_iterator node = m_buttonsInfo.GetFirst(); wxRadioBoxButtonsInfoList::compatibility_iterator node = m_buttonsInfo.GetFirst();
while (node) while (node)
{ {
g_signal_handlers_disconnect_by_func (node->GetData()->button, g_signal_handlers_block_by_func(node->GetData()->button,
(gpointer) gtk_radiobutton_clicked_callback, (gpointer)gtk_radiobutton_clicked_callback, this);
this);
node = node->GetNext(); node = node->GetNext();
} }
@@ -568,8 +567,8 @@ void wxRadioBox::GtkEnableEvents()
wxRadioBoxButtonsInfoList::compatibility_iterator node = m_buttonsInfo.GetFirst(); wxRadioBoxButtonsInfoList::compatibility_iterator node = m_buttonsInfo.GetFirst();
while (node) while (node)
{ {
g_signal_connect (node->GetData()->button, "clicked", g_signal_handlers_unblock_by_func(node->GetData()->button,
G_CALLBACK (gtk_radiobutton_clicked_callback), this); (gpointer)gtk_radiobutton_clicked_callback, this);
node = node->GetNext(); node = node->GetNext();
} }

10
src/gtk/scrolbar.cpp
View File

@@ -199,13 +199,13 @@ void wxScrollBar::SetThumbPosition( int viewStart )
m_scrollPos[i] = m_scrollPos[i] =
adj->value = viewStart; adj->value = viewStart;
g_signal_handlers_disconnect_by_func( m_widget, g_signal_handlers_block_by_func(m_widget,
(gpointer)gtk_value_changed, this); (gpointer)gtk_value_changed, this);
gtk_adjustment_value_changed(adj); gtk_adjustment_value_changed(adj);
g_signal_connect_after(m_widget, "value_changed", g_signal_handlers_unblock_by_func(m_widget,
G_CALLBACK(gtk_value_changed), this); (gpointer)gtk_value_changed, this);
} }
} }

17
src/gtk/textctrl.cpp
View File

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

10
src/gtk/window.cpp
View File

@@ -4159,13 +4159,13 @@ void wxWindowGTK::SetScrollPos(int orient, int pos, bool WXUNUSED(refresh))
pos = 0; pos = 0;
m_scrollPos[dir] = adj->value = pos; m_scrollPos[dir] = adj->value = pos;
g_signal_handlers_disconnect_by_func( m_scrollBar[dir], g_signal_handlers_block_by_func(m_scrollBar[dir],
(gpointer)gtk_scrollbar_value_changed, this); (gpointer)gtk_scrollbar_value_changed, this);
gtk_adjustment_value_changed(adj); gtk_adjustment_value_changed(adj);
g_signal_connect_after(m_scrollBar[dir], "value_changed", g_signal_handlers_unblock_by_func(m_scrollBar[dir],
G_CALLBACK(gtk_scrollbar_value_changed), this); (gpointer)gtk_scrollbar_value_changed, this);
} }
} }