X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/8cd6a9ad50c00a94e62558a3b55e814028d81100..46405e36bf9962b251e77e5048e96bf6a54edb15:/src/gtk/spinctrl.cpp?ds=sidebyside diff --git a/src/gtk/spinctrl.cpp b/src/gtk/spinctrl.cpp index 77a9cb485b..d84c02d39d 100644 --- 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((int)(win->m_value + 0.5)); // FIXME should be SetValue - event.SetString(GTK_ENTRY(spinbutton)->text); + event.SetPosition(static_cast(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(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 ); } } @@ -113,9 +103,19 @@ bool wxSpinCtrlGTKBase::Create(wxWindow *parent, wxWindowID id, } m_widget = gtk_spin_button_new_with_range(min, max, inc); + 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) ) + align = 1.0; + else if ( HasFlag(wxALIGN_CENTRE) ) + align = 0.5; + else + align = 0.0; + + gtk_entry_set_alignment(GTK_ENTRY(m_widget), align); gtk_spin_button_set_wrap( GTK_SPIN_BUTTON(m_widget), (int)(m_windowStyle & wxSP_WRAP) ); @@ -139,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) ); - wx_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 @@ -171,13 +185,13 @@ double wxSpinCtrlGTKBase::DoGetIncrement() const wxCHECK_MSG( (m_widget != NULL), 0, wxT("invalid spin button") ); double inc = 0; - gtk_spin_button_get_increments( GTK_SPIN_BUTTON(m_widget), NULL, &inc); + gtk_spin_button_get_increments( GTK_SPIN_BUTTON(m_widget), &inc, NULL); return inc; } 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) ); } @@ -204,12 +218,8 @@ void wxSpinCtrlGTKBase::DoSetValue( double value ) { wxCHECK_RET( (m_widget != NULL), wxT("invalid spin button") ); - if (wxIsKindOf(this, wxSpinCtrl)) - value = int(value + 0.5); - 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(); } @@ -239,7 +249,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(); } @@ -248,8 +257,12 @@ void wxSpinCtrlGTKBase::DoSetIncrement(double inc) wxCHECK_RET( m_widget, "invalid spin button" ); 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)); + + // Preserve the old page value when changing just the increment. + double page = 10*inc; + gtk_spin_button_get_increments( GTK_SPIN_BUTTON(m_widget), NULL, &page); + + gtk_spin_button_set_increments( GTK_SPIN_BUTTON(m_widget), inc, page); GtkEnableEvents(); }