From ef1e53d1b3ce4a400e4d11807f55b3cf8ca5f9d5 Mon Sep 17 00:00:00 2001
From: Robert Roebling <robert@roebling.de>
Date: Tue, 10 Jul 2007 11:48:41 +0000
Subject: [PATCH] Block all events in wxSpinCtrl::SetValue etc.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_8_BRANCH@47290 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---
 src/gtk/spinctrl.cpp | 38 ++++++++++++++++++++++++++++----------
 1 file changed, 28 insertions(+), 10 deletions(-)

diff --git a/src/gtk/spinctrl.cpp b/src/gtk/spinctrl.cpp
index 2cea9634f5..8dd99b1689 100644
--- a/src/gtk/spinctrl.cpp
+++ b/src/gtk/spinctrl.cpp
@@ -118,8 +118,8 @@ bool wxSpinCtrl::Create(wxWindow *parent, wxWindowID id,
     gtk_spin_button_set_wrap( GTK_SPIN_BUTTON(m_widget),
                               (int)(m_windowStyle & wxSP_WRAP) );
 
-    g_signal_connect(m_widget, "value_changed", G_CALLBACK(gtk_value_changed), this);
-    g_signal_connect(m_widget, "changed", G_CALLBACK(gtk_changed), this);
+    g_signal_connect_after(m_widget, "value_changed", G_CALLBACK(gtk_value_changed), this);
+    g_signal_connect_after(m_widget, "changed", G_CALLBACK(gtk_changed), this);
 
     m_parent->DoAddChild( this );
 
@@ -151,13 +151,31 @@ int wxSpinCtrl::GetMax() const
     return int(max);
 }
 
+static void wxSpinCtrl_GtkDisableEvents( const wxSpinCtrl *spinctrl )
+{
+    g_signal_handlers_block_by_func( spinctrl->m_widget,
+        (gpointer)gtk_value_changed, (void*) spinctrl );
+        
+    g_signal_handlers_block_by_func( spinctrl->m_widget,
+        (gpointer)gtk_changed, (void*) spinctrl );
+}
+
+static void wxSpinCtrl_GtkEnableEvents( const wxSpinCtrl *spinctrl )
+{
+    g_signal_handlers_unblock_by_func( spinctrl->m_widget,
+        (gpointer)gtk_value_changed, (void*) spinctrl );
+        
+    g_signal_handlers_unblock_by_func( spinctrl->m_widget,
+        (gpointer)gtk_changed, (void*) spinctrl );
+}
+
 int wxSpinCtrl::GetValue() const
 {
     wxCHECK_MSG( (m_widget != NULL), 0, wxT("invalid spin button") );
 
-    wx_const_cast(wxSpinCtrl*, this)->BlockScrollEvent();
+    wxSpinCtrl_GtkDisableEvents( this );
     gtk_spin_button_update( GTK_SPIN_BUTTON(m_widget) );
-    wx_const_cast(wxSpinCtrl*, this)->UnblockScrollEvent();
+    wxSpinCtrl_GtkEnableEvents( this );
 
     return m_pos;
 }
@@ -175,9 +193,9 @@ void wxSpinCtrl::SetValue( const wxString& value )
     else
     {
         // invalid number - set text as is (wxMSW compatible)
-        BlockScrollEvent();
+        wxSpinCtrl_GtkDisableEvents( this );
         gtk_entry_set_text( GTK_ENTRY(m_widget), wxGTK_CONV( value ) );
-        UnblockScrollEvent();
+        wxSpinCtrl_GtkEnableEvents( this );
     }
 }
 
@@ -185,9 +203,9 @@ void wxSpinCtrl::SetValue( int value )
 {
     wxCHECK_RET( (m_widget != NULL), wxT("invalid spin button") );
 
-    BlockScrollEvent();
+    wxSpinCtrl_GtkDisableEvents( this );
     gtk_spin_button_set_value((GtkSpinButton*)m_widget, value);
-    UnblockScrollEvent();
+    wxSpinCtrl_GtkEnableEvents( this );
 }
 
 void wxSpinCtrl::SetSelection(long from, long to)
@@ -207,9 +225,9 @@ void wxSpinCtrl::SetRange(int minVal, int maxVal)
 {
     wxCHECK_RET( (m_widget != NULL), wxT("invalid spin button") );
 
-    BlockScrollEvent();
+    wxSpinCtrl_GtkDisableEvents( this );
     gtk_spin_button_set_range((GtkSpinButton*)m_widget, minVal, maxVal);
-    UnblockScrollEvent();
+    wxSpinCtrl_GtkEnableEvents( this );
 }
 
 void wxSpinCtrl::OnChar( wxKeyEvent &event )