more value updating fixes

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@48667 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/src/gtk/spinbutt.cpp b/src/gtk/spinbutt.cpp
index 748bf04ec3066eb86e351b7d81fc32c6c3442851..ea7478c5194ffeb18b2ae7df97f3e8ea613037b0 100644 (file)
--- a/src/gtk/spinbutt.cpp
+++ b/src/gtk/spinbutt.cpp
@@ -52,9 +52,9 @@ gtk_value_changed(GtkSpinButton* spinbutton, wxSpinButton* win)
         !event.IsAllowed() )
     {
         /* program has vetoed */
         !event.IsAllowed() )
     {
         /* program has vetoed */

-        win->BlockScrollEvent();
+        // this will cause another "value_changed" signal,
+        // but because pos == oldPos nothing will happen

         gtk_spin_button_set_value(spinbutton, oldPos);
         gtk_spin_button_set_value(spinbutton, oldPos);

-        win->UnblockScrollEvent();

         return;
     }
 
         return;
     }
 


@@ -162,6 +162,7 @@ void wxSpinButton::SetRange(int minVal, int maxVal)
 
     GtkDisableEvents();
     gtk_spin_button_set_range((GtkSpinButton*)m_widget, minVal, maxVal);
 
     GtkDisableEvents();
     gtk_spin_button_set_range((GtkSpinButton*)m_widget, minVal, maxVal);

+    m_pos = int(gtk_spin_button_get_value((GtkSpinButton*)m_widget));

     GtkEnableEvents();
 }
 
     GtkEnableEvents();
 }
 

diff --git a/src/gtk/spinctrl.cpp b/src/gtk/spinctrl.cpp
index 6b46c461b27343238a2575e0e6ff20412813e467..e51e428d56bd16c6d90c0a08aaf6c8daed3bde59 100644 (file)
--- a/src/gtk/spinctrl.cpp
+++ b/src/gtk/spinctrl.cpp
@@ -38,7 +38,7 @@ static void
 gtk_value_changed(GtkSpinButton* spinbutton, wxSpinCtrl* win)
 {
     win->m_pos = int(gtk_spin_button_get_value(spinbutton));
 gtk_value_changed(GtkSpinButton* spinbutton, wxSpinCtrl* win)
 {
     win->m_pos = int(gtk_spin_button_get_value(spinbutton));

-    if (!win->m_hasVMT || g_blockEventsOnDrag || win->m_blockScrollEvent)
+    if (!win->m_hasVMT || g_blockEventsOnDrag)

         return;
 
     wxCommandEvent event( wxEVT_COMMAND_SPINCTRL_UPDATED, win->GetId());
         return;
 
     wxCommandEvent event( wxEVT_COMMAND_SPINCTRL_UPDATED, win->GetId());


@@ -63,7 +63,7 @@ extern "C" {
 static void
 gtk_changed(GtkSpinButton* spinbutton, wxSpinCtrl* win)
 {
 static void
 gtk_changed(GtkSpinButton* spinbutton, wxSpinCtrl* win)
 {

-    if (!win->m_hasVMT || win->m_blockScrollEvent)
+    if (!win->m_hasVMT)

         return;
 
     wxCommandEvent event( wxEVT_COMMAND_TEXT_UPDATED, win->GetId() );
         return;
 
     wxCommandEvent event( wxEVT_COMMAND_TEXT_UPDATED, win->GetId() );


@@ -151,6 +151,7 @@ int wxSpinCtrl::GetValue() const
 
     GtkDisableEvents();
     gtk_spin_button_update( GTK_SPIN_BUTTON(m_widget) );
 
     GtkDisableEvents();
     gtk_spin_button_update( GTK_SPIN_BUTTON(m_widget) );

+    m_pos = int(gtk_spin_button_get_value(GTK_SPIN_BUTTON(m_widget)));

     GtkEnableEvents();
 
     return m_pos;
     GtkEnableEvents();
 
     return m_pos;


@@ -204,6 +205,7 @@ void wxSpinCtrl::SetRange(int minVal, int maxVal)
 
     GtkDisableEvents();
     gtk_spin_button_set_range( GTK_SPIN_BUTTON(m_widget), minVal, maxVal);
 
     GtkDisableEvents();
     gtk_spin_button_set_range( GTK_SPIN_BUTTON(m_widget), minVal, maxVal);

+    m_pos = int(gtk_spin_button_get_value(GTK_SPIN_BUTTON(m_widget)));

     GtkEnableEvents();
 }
 
     GtkEnableEvents();
 }
 


@@ -212,7 +214,7 @@ void wxSpinCtrl::GtkDisableEvents() const
 {
     g_signal_handlers_block_by_func( m_widget,
         (gpointer)gtk_value_changed, (void*) this);
 {
     g_signal_handlers_block_by_func( m_widget,
         (gpointer)gtk_value_changed, (void*) this);

-        
+

     g_signal_handlers_block_by_func(m_widget,
         (gpointer)gtk_changed, (void*) this);
 }
     g_signal_handlers_block_by_func(m_widget,
         (gpointer)gtk_changed, (void*) this);
 }


@@ -221,7 +223,7 @@ void wxSpinCtrl::GtkEnableEvents() const
 {
     g_signal_handlers_unblock_by_func(m_widget,
         (gpointer)gtk_value_changed, (void*) this);
 {
     g_signal_handlers_unblock_by_func(m_widget,
         (gpointer)gtk_value_changed, (void*) this);

-        
+

     g_signal_handlers_unblock_by_func(m_widget,
         (gpointer)gtk_changed, (void*) this);
 }
     g_signal_handlers_unblock_by_func(m_widget,
         (gpointer)gtk_changed, (void*) this);
 }