X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/5c33522fca7cddc441a316f5b9fb50d7685435ba..bb996f289574defb0ae4339ae8e46ff3cf6fa54c:/src/gtk/spinctrl.cpp diff --git a/src/gtk/spinctrl.cpp b/src/gtk/spinctrl.cpp index cb2d02f4f7..e7b798197a 100644 --- a/src/gtk/spinctrl.cpp +++ b/src/gtk/spinctrl.cpp @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: src/gtk/spinbutt.cpp +// Name: src/gtk/spinctrl.cpp // Purpose: wxSpinCtrl // Author: Robert // Modified by: @@ -21,7 +21,9 @@ #include "wx/wxcrtvararg.h" #endif +#include #include "wx/gtk/private.h" +#include "wx/gtk/private/gtk2-compat.h" //----------------------------------------------------------------------------- // data @@ -37,31 +39,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) + if (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 ); } } @@ -75,15 +69,10 @@ extern "C" { static void gtk_changed(GtkSpinButton* spinbutton, wxSpinCtrl* win) { - if (!win->m_hasVMT) - return; - 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 ); } } @@ -92,8 +81,6 @@ gtk_changed(GtkSpinButton* spinbutton, wxSpinCtrl* win) // wxSpinCtrlGTKBase //----------------------------------------------------------------------------- -IMPLEMENT_DYNAMIC_CLASS(wxSpinCtrlGTKBase, wxSpinCtrlBase) - BEGIN_EVENT_TABLE(wxSpinCtrlGTKBase, wxSpinCtrlBase) EVT_CHAR(wxSpinCtrlGTKBase::OnChar) END_EVENT_TABLE() @@ -116,7 +103,16 @@ 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) ) + 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) ); @@ -140,13 +136,29 @@ 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(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); + GtkAdjustment* adj = + gtk_spin_button_get_adjustment(GTK_SPIN_BUTTON(m_widget)); + const double lower = gtk_adjustment_get_lower(adj); + const double upper = gtk_adjustment_get_upper(adj); + if (value < lower) + value = lower; + else if (value > upper) + value = upper; + + return value; } double wxSpinCtrlGTKBase::DoGetMin() const @@ -172,15 +184,15 @@ 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) ); + return gtk_spin_button_get_snap_to_ticks( GTK_SPIN_BUTTON(m_widget) ) != 0; } void wxSpinCtrlGTKBase::SetValue( const wxString& value ) @@ -205,12 +217,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(); } @@ -240,7 +248,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(); } @@ -249,8 +256,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(); } @@ -285,7 +296,7 @@ void wxSpinCtrlGTKBase::OnChar( wxKeyEvent &event ) GtkWindow *window = GTK_WINDOW(top_frame->m_widget); if ( window ) { - GtkWidget *widgetDef = window->default_widget; + GtkWidget* widgetDef = gtk_window_get_default_widget(window); if ( widgetDef ) { @@ -311,10 +322,15 @@ void wxSpinCtrlGTKBase::OnChar( wxKeyEvent &event ) GdkWindow *wxSpinCtrlGTKBase::GTKGetWindow(wxArrayGdkWindows& windows) const { +#ifdef __WXGTK3__ + // no access to internal GdkWindows + wxUnusedVar(windows); +#else GtkSpinButton* spinbutton = GTK_SPIN_BUTTON(m_widget); windows.push_back(spinbutton->entry.text_area); windows.push_back(spinbutton->panel); +#endif return NULL; } @@ -340,7 +356,77 @@ wxSpinCtrlGTKBase::GetClassDefaultAttributes(wxWindowVariant WXUNUSED(variant)) // wxSpinCtrl //----------------------------------------------------------------------------- -IMPLEMENT_DYNAMIC_CLASS(wxSpinCtrl, wxSpinCtrlGTKBase) +extern "C" +{ + +static gboolean +wx_gtk_spin_input(GtkSpinButton* spin, gdouble* val, wxSpinCtrl* win) +{ + // We might use g_ascii_strtoll() here but it's 2.12+ only, so use our own + // wxString function even if this requires an extra conversion. + const wxString + text(wxString::FromUTF8(gtk_entry_get_text(GTK_ENTRY(spin)))); + + long lval; + if ( !text.ToLong(&lval, win->GetBase()) ) + return FALSE; + + *val = lval; + + return TRUE; +} + +static gint +wx_gtk_spin_output(GtkSpinButton* spin, wxSpinCtrl* win) +{ + const gint val = gtk_spin_button_get_value_as_int(spin); + + gtk_entry_set_text + ( + GTK_ENTRY(spin), + wxPrivate::wxSpinCtrlFormatAsHex(val, win->GetMax()).utf8_str() + ); + + return TRUE; +} + +} // extern "C" + +bool wxSpinCtrl::SetBase(int base) +{ + // Currently we only support base 10 and 16. We could add support for base + // 8 quite easily but wxMSW doesn't support it natively so don't bother + // with doing something wxGTK-specific here. + if ( base != 10 && base != 16 ) + return false; + + if ( base == m_base ) + return true; + + m_base = base; + + // We need to be able to enter letters for any base greater than 10. + gtk_spin_button_set_numeric( GTK_SPIN_BUTTON(m_widget), m_base <= 10 ); + + if ( m_base != 10 ) + { + g_signal_connect( m_widget, "input", + G_CALLBACK(wx_gtk_spin_input), this); + g_signal_connect( m_widget, "output", + G_CALLBACK(wx_gtk_spin_output), this); + } + else + { + g_signal_handlers_disconnect_by_func(m_widget, + (gpointer)wx_gtk_spin_input, + this); + g_signal_handlers_disconnect_by_func(m_widget, + (gpointer)wx_gtk_spin_output, + this); + } + + return true; +} //----------------------------------------------------------------------------- // wxSpinCtrlDouble