X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/a1abca322fd7a9a7abe6cc0b144987786faa0f05..e9d7a889634ee5cbe90bcc639c6197a29169be3a:/src/gtk/spinctrl.cpp diff --git a/src/gtk/spinctrl.cpp b/src/gtk/spinctrl.cpp index f45bd0cc4a..e2c07c0b74 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: @@ -18,9 +18,12 @@ #ifndef WX_PRECOMP #include "wx/textctrl.h" // for wxEVT_COMMAND_TEXT_UPDATED #include "wx/utils.h" + #include "wx/wxcrtvararg.h" #endif +#include #include "wx/gtk/private.h" +#include "wx/gtk/private/gtk2-compat.h" //----------------------------------------------------------------------------- // data @@ -34,23 +37,27 @@ extern bool g_blockEventsOnDrag; extern "C" { static void -gtk_value_changed(GtkSpinButton* spinbutton, wxSpinCtrl* win) +gtk_value_changed(GtkSpinButton* spinbutton, wxSpinCtrlGTKBase* 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()); - event.SetEventObject( win ); - - // 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) - event.SetInt(win->m_pos); - win->GetEventHandler()->ProcessEvent( event ); + if (wxIsKindOf(win, wxSpinCtrl)) + { + wxSpinEvent event(wxEVT_COMMAND_SPINCTRL_UPDATED, win->GetId()); + event.SetEventObject( win ); + 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(static_cast(win)->GetValue()); + event.SetString(gtk_entry_get_text(GTK_ENTRY(spinbutton))); + win->HandleWindowEvent( event ); + } } } @@ -62,59 +69,61 @@ extern "C" { 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() ); event.SetEventObject( win ); - event.SetString( GTK_ENTRY(spinbutton)->text ); - - // see above - event.SetInt(win->m_pos); - win->GetEventHandler()->ProcessEvent( event ); + event.SetString(gtk_entry_get_text(GTK_ENTRY(spinbutton))); + event.SetInt(win->GetValue()); + win->HandleWindowEvent( event ); } } //----------------------------------------------------------------------------- -// wxSpinCtrl +// wxSpinCtrlGTKBase //----------------------------------------------------------------------------- -IMPLEMENT_DYNAMIC_CLASS(wxSpinCtrl,wxControl) +IMPLEMENT_DYNAMIC_CLASS(wxSpinCtrlGTKBase, wxSpinCtrlBase) -BEGIN_EVENT_TABLE(wxSpinCtrl, wxControl) - EVT_CHAR(wxSpinCtrl::OnChar) +BEGIN_EVENT_TABLE(wxSpinCtrlGTKBase, wxSpinCtrlBase) + EVT_CHAR(wxSpinCtrlGTKBase::OnChar) END_EVENT_TABLE() -wxSpinCtrl::wxSpinCtrl() -{ - m_pos = 0; -} - -bool wxSpinCtrl::Create(wxWindow *parent, wxWindowID id, +bool wxSpinCtrlGTKBase::Create(wxWindow *parent, wxWindowID id, const wxString& value, const wxPoint& pos, const wxSize& size, long style, - int min, int max, int initial, + double min, double max, double initial, double inc, const wxString& name) { - m_needParent = true; - if (!PreCreation( parent, pos, size ) || !CreateBase( parent, id, pos, size, style, wxDefaultValidator, name )) { - wxFAIL_MSG( wxT("wxSpinCtrl creation failed") ); + wxFAIL_MSG( wxT("wxSpinCtrlGTKBase creation failed") ); return false; } - m_widget = gtk_spin_button_new_with_range(min, max, 1); - gtk_spin_button_set_value((GtkSpinButton*)m_widget, initial); - m_pos = int(gtk_spin_button_get_value((GtkSpinButton*)m_widget)); + 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); + + 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) ); - 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 ); @@ -128,64 +137,104 @@ bool wxSpinCtrl::Create(wxWindow *parent, wxWindowID id, return true; } -int wxSpinCtrl::GetMin() const +double wxSpinCtrlGTKBase::DoGetValue() const { wxCHECK_MSG( (m_widget != NULL), 0, wxT("invalid spin button") ); - double min; - gtk_spin_button_get_range((GtkSpinButton*)m_widget, &min, NULL); - return int(min); + // 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; } -int wxSpinCtrl::GetMax() const +double wxSpinCtrlGTKBase::DoGetMin() const { wxCHECK_MSG( (m_widget != NULL), 0, wxT("invalid spin button") ); - double max; - gtk_spin_button_get_range((GtkSpinButton*)m_widget, NULL, &max); - return int(max); + double min = 0; + gtk_spin_button_get_range( GTK_SPIN_BUTTON(m_widget), &min, NULL); + return min; } -int wxSpinCtrl::GetValue() const +double wxSpinCtrlGTKBase::DoGetMax() const { wxCHECK_MSG( (m_widget != NULL), 0, wxT("invalid spin button") ); - wx_const_cast(wxSpinCtrl*, this)->BlockScrollEvent(); - gtk_spin_button_update( GTK_SPIN_BUTTON(m_widget) ); - wx_const_cast(wxSpinCtrl*, this)->UnblockScrollEvent(); + double max = 0; + gtk_spin_button_get_range( GTK_SPIN_BUTTON(m_widget), NULL, &max); + return max; +} - return m_pos; +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), &inc, NULL); + return inc; +} + +bool wxSpinCtrlGTKBase::GetSnapToTicks() const +{ + wxCHECK_MSG(m_widget, false, "invalid spin button"); + + return gtk_spin_button_get_snap_to_ticks( GTK_SPIN_BUTTON(m_widget) ) != 0; } -void wxSpinCtrl::SetValue( const wxString& value ) +void wxSpinCtrlGTKBase::SetValue( const wxString& value ) { wxCHECK_RET( (m_widget != NULL), wxT("invalid spin button") ); - int n; - if ( (wxSscanf(value, wxT("%d"), &n) == 1) ) - { - // a number - set it - SetValue(n); - } - else + double n; + if ( wxSscanf(value, "%lg", &n) == 1 ) { - // invalid number - set text as is (wxMSW compatible) - BlockScrollEvent(); - gtk_entry_set_text( GTK_ENTRY(m_widget), wxGTK_CONV( value ) ); - UnblockScrollEvent(); + // a number - set it, let DoSetValue round for int value + DoSetValue(n); + return; } + + // invalid number - set text as is (wxMSW compatible) + GtkDisableEvents(); + gtk_entry_set_text( GTK_ENTRY(m_widget), wxGTK_CONV( value ) ); + GtkEnableEvents(); } -void wxSpinCtrl::SetValue( int value ) +void wxSpinCtrlGTKBase::DoSetValue( double value ) { wxCHECK_RET( (m_widget != NULL), wxT("invalid spin button") ); - BlockScrollEvent(); - gtk_spin_button_set_value((GtkSpinButton*)m_widget, value); - UnblockScrollEvent(); + GtkDisableEvents(); + gtk_spin_button_set_value( GTK_SPIN_BUTTON(m_widget), value); + GtkEnableEvents(); +} + +void wxSpinCtrlGTKBase::SetSnapToTicks(bool snap_to_ticks) +{ + wxCHECK_RET( (m_widget != NULL), "invalid spin button" ); + + gtk_spin_button_set_snap_to_ticks( GTK_SPIN_BUTTON(m_widget), snap_to_ticks); } -void wxSpinCtrl::SetSelection(long from, long to) +void wxSpinCtrlGTKBase::SetSelection(long from, long to) { // translate from wxWidgets conventions to GTK+ ones: (-1, -1) means the // entire range @@ -198,16 +247,48 @@ void wxSpinCtrl::SetSelection(long from, long to) gtk_editable_select_region( GTK_EDITABLE(m_widget), (gint)from, (gint)to ); } -void wxSpinCtrl::SetRange(int minVal, int maxVal) +void wxSpinCtrlGTKBase::DoSetRange(double minVal, double maxVal) { wxCHECK_RET( (m_widget != NULL), wxT("invalid spin button") ); - BlockScrollEvent(); - gtk_spin_button_set_range((GtkSpinButton*)m_widget, minVal, maxVal); - UnblockScrollEvent(); + GtkDisableEvents(); + gtk_spin_button_set_range( GTK_SPIN_BUTTON(m_widget), minVal, maxVal); + GtkEnableEvents(); } -void wxSpinCtrl::OnChar( wxKeyEvent &event ) +void wxSpinCtrlGTKBase::DoSetIncrement(double inc) +{ + wxCHECK_RET( m_widget, "invalid spin button" ); + + GtkDisableEvents(); + + // 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(); +} + +void wxSpinCtrlGTKBase::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_changed, (void*) this); +} + +void wxSpinCtrlGTKBase::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_changed, (void*) this); +} + +void wxSpinCtrlGTKBase::OnChar( wxKeyEvent &event ) { wxCHECK_RET( m_widget != NULL, wxT("invalid spin ctrl") ); @@ -220,7 +301,7 @@ void wxSpinCtrl::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 ) { @@ -238,23 +319,28 @@ void wxSpinCtrl::OnChar( wxKeyEvent &event ) GtkSpinButton *gsb = GTK_SPIN_BUTTON(m_widget); wxString val = wxGTK_CONV_BACK( gtk_entry_get_text( &gsb->entry ) ); evt.SetString( val ); - if (GetEventHandler()->ProcessEvent(evt)) return; + if (HandleWindowEvent(evt)) return; } event.Skip(); } -GdkWindow *wxSpinCtrl::GTKGetWindow(wxArrayGdkWindows& windows) const +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; } -wxSize wxSpinCtrl::DoGetBestSize() const +wxSize wxSpinCtrlGTKBase::DoGetBestSize() const { wxSize ret( wxControl::DoGetBestSize() ); wxSize best(95, ret.y); // FIXME: 95? @@ -264,12 +350,35 @@ wxSize wxSpinCtrl::DoGetBestSize() const // static wxVisualAttributes -wxSpinCtrl::GetClassDefaultAttributes(wxWindowVariant WXUNUSED(variant)) +wxSpinCtrlGTKBase::GetClassDefaultAttributes(wxWindowVariant WXUNUSED(variant)) { // TODO: overload to accept functions like gtk_spin_button_new? // Until then use a similar type return GetDefaultAttributesFromGTKWidget(gtk_entry_new, true); } -#endif - // wxUSE_SPINCTRL +//----------------------------------------------------------------------------- +// wxSpinCtrl +//----------------------------------------------------------------------------- + +//----------------------------------------------------------------------------- +// wxSpinCtrlDouble +//----------------------------------------------------------------------------- + +IMPLEMENT_DYNAMIC_CLASS(wxSpinCtrlDouble, wxSpinCtrlGTKBase) + +unsigned wxSpinCtrlDouble::GetDigits() const +{ + wxCHECK_MSG( m_widget, 0, "invalid spin button" ); + + return gtk_spin_button_get_digits( GTK_SPIN_BUTTON(m_widget) ); +} + +void wxSpinCtrlDouble::SetDigits(unsigned digits) +{ + wxCHECK_RET( m_widget, "invalid spin button" ); + + gtk_spin_button_set_digits( GTK_SPIN_BUTTON(m_widget), digits); +} + +#endif // wxUSE_SPINCTRL