avoid causing idle event from GetValue(), fixes #11013

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

diff --git a/include/wx/gtk/spinctrl.h b/include/wx/gtk/spinctrl.h
index 2954b27e9bc02376d2fe694b37bcd3115042b260..53649b59ec9967ecc1e7c8f88f6ba090c89a830d 100644 (file)
--- a/include/wx/gtk/spinctrl.h
+++ b/include/wx/gtk/spinctrl.h
@@ -23,17 +23,15 @@
 class WXDLLIMPEXP_CORE wxSpinCtrlGTKBase : public wxSpinCtrlBase
 {
 public:
-    wxSpinCtrlGTKBase() : m_value(0) {}
-
     bool Create(wxWindow *parent,
-                wxWindowID id = wxID_ANY,
-                const wxString& value = wxEmptyString,
-                const wxPoint& pos = wxDefaultPosition,
-                const wxSize& size = wxDefaultSize,
-                long style = wxSP_ARROW_KEYS | wxALIGN_RIGHT,
-                double min = 0, double max = 100, double initial = 0,
-                double inc = 1,
-                const wxString& name = wxT("wxSpinCtrlGTKBase"));
+                wxWindowID id,
+                const wxString& value,
+                const wxPoint& pos,
+                const wxSize& size,
+                long style,
+                double min, double max, double initial,
+                double inc,
+                const wxString& name);
 
     // wxSpinCtrl(Double) methods call DoXXX functions of the same name
 
@@ -60,10 +58,7 @@ public:
     // implementation
     void OnChar( wxKeyEvent &event );
 
-    double m_value; // public for GTK callback function
-
 protected:
-
     double DoGetValue() const;
     double DoGetMin() const;
     double DoGetMax() const;
@@ -84,7 +79,6 @@ protected:
     // override this and return true.
     virtual bool UseGTKStyleBase() const { return true; }
 
-private:
     DECLARE_DYNAMIC_CLASS(wxSpinCtrlGTKBase)
     DECLARE_EVENT_TABLE()
 };
@@ -104,7 +98,7 @@ public:
                const wxSize& size = wxDefaultSize,
                long style = wxSP_ARROW_KEYS | wxALIGN_RIGHT,
                int min = 0, int max = 100, int initial = 0,
-               const wxString& name = wxT("wxSpinCtrl"))
+               const wxString& name = wxS("wxSpinCtrl"))
     {
         Create(parent, id, value, pos, size, style, min, max, initial, name);
     }
@@ -116,7 +110,7 @@ public:
                 const wxSize& size = wxDefaultSize,
                 long style = wxSP_ARROW_KEYS | wxALIGN_RIGHT,
                 int min = 0, int max = 100, int initial = 0,
-                const wxString& name = wxT("wxSpinCtrl"))
+                const wxString& name = wxS("wxSpinCtrl"))
     {
         return wxSpinCtrlGTKBase::Create(parent, id, value, pos, size,
                                          style, min, max, initial, 1, name);
@@ -134,7 +128,6 @@ public:
     void SetRange( int minVal, int maxVal ) { DoSetRange(minVal, maxVal); }
     void SetIncrement( double inc )         { DoSetIncrement(inc); }
 
-private:
     DECLARE_DYNAMIC_CLASS(wxSpinCtrl)
 };
 
@@ -154,7 +147,7 @@ public:
                      long style = wxSP_ARROW_KEYS | wxALIGN_RIGHT,
                      double min = 0, double max = 100, double initial = 0,
                      double inc = 1,
-                     const wxString& name = wxT("wxSpinCtrlDouble"))
+                     const wxString& name = wxS("wxSpinCtrlDouble"))
     {
         Create(parent, id, value, pos, size, style,
                min, max, initial, inc, name);
@@ -168,7 +161,7 @@ public:
                 long style = wxSP_ARROW_KEYS | wxALIGN_RIGHT,
                 double min = 0, double max = 100, double initial = 0,
                 double inc = 1,
-                const wxString& name = wxT("wxSpinCtrlDouble"))
+                const wxString& name = wxS("wxSpinCtrlDouble"))
     {
         return wxSpinCtrlGTKBase::Create(parent, id, value, pos, size,
                                          style, min, max, initial, inc, name);
@@ -188,7 +181,6 @@ public:
     void SetIncrement(double inc)               { DoSetIncrement(inc); }
     void SetDigits(unsigned digits);
 
-private:
     DECLARE_DYNAMIC_CLASS(wxSpinCtrlDouble)
 };
 

diff --git a/src/gtk/spinctrl.cpp b/src/gtk/spinctrl.cpp
index 5c53cd491acae0eb8aeafb176e4731ed9c9d5d84..bae8e7ea5b27b68dd9e4b3d26c9359591a5cfc11 100644 (file)
--- a/src/gtk/spinctrl.cpp
+++ b/src/gtk/spinctrl.cpp
@@ -37,31 +37,23 @@ extern "C" {
 static void
 gtk_value_changed(GtkSpinButton* spinbutton, wxSpinCtrlGTKBase* win)
 {
-    win->m_value = gtk_spin_button_get_value(spinbutton);
     if (!win->m_hasVMT || g_blockEventsOnDrag)
         return;
 
-    // note that we don't use wxSpinCtrl::GetValue() here because it would
-    // adjust the value to fit into the control range and this means that we
-    // would never be able to enter an "invalid" value in the control, even
-    // temporarily - and trying to enter 10 into the control which accepts the
-    // values in range 5..50 is then, ummm, quite challenging (hint: you can't
-    // enter 1!) (VZ)
-
     if (wxIsKindOf(win, wxSpinCtrl))
     {
         wxSpinEvent event(wxEVT_COMMAND_SPINCTRL_UPDATED, win->GetId());
         event.SetEventObject( win );
-        event.SetPosition( wxRound(win->m_value) ); // FIXME should be SetValue
-        event.SetString(GTK_ENTRY(spinbutton)->text);
+        event.SetPosition(static_cast<wxSpinCtrl*>(win)->GetValue());
+        event.SetString(gtk_entry_get_text(GTK_ENTRY(spinbutton)));
         win->HandleWindowEvent( event );
     }
     else // wxIsKindOf(win, wxSpinCtrlDouble)
     {
         wxSpinDoubleEvent event( wxEVT_COMMAND_SPINCTRLDOUBLE_UPDATED, win->GetId());
         event.SetEventObject( win );
-        event.SetValue(win->m_value);
-        event.SetString(GTK_ENTRY(spinbutton)->text);
+        event.SetValue(static_cast<wxSpinCtrlDouble*>(win)->GetValue());
+        event.SetString(gtk_entry_get_text(GTK_ENTRY(spinbutton)));
         win->HandleWindowEvent( event );
     }
 }
@@ -80,10 +72,8 @@ gtk_changed(GtkSpinButton* spinbutton, wxSpinCtrl* win)
 
     wxCommandEvent event( wxEVT_COMMAND_TEXT_UPDATED, win->GetId() );
     event.SetEventObject( win );
-    event.SetString( GTK_ENTRY(spinbutton)->text );
-
-    // see above
-    event.SetInt((int)win->m_value);
+    event.SetString(gtk_entry_get_text(GTK_ENTRY(spinbutton)));
+    event.SetInt(win->GetValue());
     win->HandleWindowEvent( event );
 }
 }
@@ -116,7 +106,6 @@ bool wxSpinCtrlGTKBase::Create(wxWindow *parent, wxWindowID id,
     g_object_ref(m_widget);
 
     gtk_spin_button_set_value( GTK_SPIN_BUTTON(m_widget), initial);
-    m_value = gtk_spin_button_get_value( GTK_SPIN_BUTTON(m_widget));
 
     gfloat align;
     if ( HasFlag(wxALIGN_RIGHT) )
@@ -150,13 +139,27 @@ double wxSpinCtrlGTKBase::DoGetValue() const
 {
     wxCHECK_MSG( (m_widget != NULL), 0, wxT("invalid spin button") );
 
-    GtkDisableEvents();
-    gtk_spin_button_update( GTK_SPIN_BUTTON(m_widget) );
-    const_cast<wxSpinCtrlGTKBase*>(this)->m_value =
-        gtk_spin_button_get_value(GTK_SPIN_BUTTON(m_widget));
-    GtkEnableEvents();
-
-    return m_value;
+    // Get value directly from current control text, just as
+    // gtk_spin_button_update() would do. Calling gtk_spin_button_update() causes
+    // a redraw, which causes an idle event, so if GetValue() is called from
+    // a UI update handler, you get a never ending sequence of idle events. It
+    // also forces the text into valid range, which wxMSW GetValue() does not do.
+    static unsigned sig_id;
+    if (sig_id == 0)
+        sig_id = g_signal_lookup("input", GTK_TYPE_SPIN_BUTTON);
+    double value;
+    int handled = 0;
+    g_signal_emit(m_widget, sig_id, 0, &value, &handled);
+    if (!handled)
+        value = g_strtod(gtk_entry_get_text(GTK_ENTRY(m_widget)), NULL);
+    const GtkAdjustment* adj =
+        gtk_spin_button_get_adjustment(GTK_SPIN_BUTTON(m_widget));
+    if (value < adj->lower)
+        value = adj->lower;
+    else if (value > adj->upper)
+        value = adj->upper;
+
+    return value;
 }
 
 double wxSpinCtrlGTKBase::DoGetMin() const
@@ -188,7 +191,7 @@ double wxSpinCtrlGTKBase::DoGetIncrement() const
 
 bool wxSpinCtrlGTKBase::GetSnapToTicks() const
 {
-    wxCHECK_MSG( m_widget, 0, "invalid spin button" );
+    wxCHECK_MSG(m_widget, false, "invalid spin button");
 
     return gtk_spin_button_get_snap_to_ticks( GTK_SPIN_BUTTON(m_widget) );
 }
@@ -220,7 +223,6 @@ void wxSpinCtrlGTKBase::DoSetValue( double value )
 
     GtkDisableEvents();
     gtk_spin_button_set_value( GTK_SPIN_BUTTON(m_widget), value);
-    m_value = gtk_spin_button_get_value( GTK_SPIN_BUTTON(m_widget));
     GtkEnableEvents();
 }
 
@@ -250,7 +252,6 @@ void wxSpinCtrlGTKBase::DoSetRange(double minVal, double maxVal)
 
     GtkDisableEvents();
     gtk_spin_button_set_range( GTK_SPIN_BUTTON(m_widget), minVal, maxVal);
-    m_value = gtk_spin_button_get_value(GTK_SPIN_BUTTON(m_widget));
     GtkEnableEvents();
 }
 
@@ -260,7 +261,6 @@ void wxSpinCtrlGTKBase::DoSetIncrement(double inc)
 
     GtkDisableEvents();
     gtk_spin_button_set_increments( GTK_SPIN_BUTTON(m_widget), inc, 10*inc);
-    m_value = gtk_spin_button_get_value(GTK_SPIN_BUTTON(m_widget));
     GtkEnableEvents();
 }