X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/8907154c1a8a6882c6797d1f16393ddfb23e7f3a..fb8d7eb7a880f1f2e32d8830f9c5e12b2536e05f:/src/gtk/spinbutt.cpp diff --git a/src/gtk/spinbutt.cpp b/src/gtk/spinbutt.cpp index b91d902de2..2a190e9e1c 100644 --- a/src/gtk/spinbutt.cpp +++ b/src/gtk/spinbutt.cpp @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: spinbutt.cpp +// Name: src/gtk/spinbutt.cpp // Purpose: wxSpinButton // Author: Robert // Modified by: @@ -11,20 +11,15 @@ // For compilers that support precompilation, includes "wx.h". #include "wx/wxprec.h" -#include "wx/spinbutt.h" - #if wxUSE_SPINBTN -#include "wx/utils.h" -#include "wx/math.h" -#include "wx/gtk/private.h" +#include "wx/spinbutt.h" -//----------------------------------------------------------------------------- -// idle system -//----------------------------------------------------------------------------- +#ifndef WX_PRECOMP + #include "wx/utils.h" +#endif -extern void wxapp_install_idle_handler(); -extern bool g_isIdle; +#include //----------------------------------------------------------------------------- // data @@ -32,67 +27,44 @@ extern bool g_isIdle; extern bool g_blockEventsOnDrag; -static const float sensitivity = 0.02; - //----------------------------------------------------------------------------- // "value_changed" //----------------------------------------------------------------------------- extern "C" { -static void gtk_spinbutt_callback( GtkWidget *WXUNUSED(widget), wxSpinButton *win ) +static void +gtk_value_changed(GtkSpinButton* spinbutton, wxSpinButton* win) { - if (g_isIdle) wxapp_install_idle_handler(); - - if (!win->m_hasVMT) return; - if (g_blockEventsOnDrag) return; - - float diff = win->m_adjust->value - win->m_oldPos; - if (fabs(diff) < sensitivity) return; - - wxEventType command = wxEVT_NULL; - - float line_step = win->m_adjust->step_increment; - - if (fabs(diff-line_step) < sensitivity) command = wxEVT_SCROLL_LINEUP; - else if (fabs(diff+line_step) < sensitivity) command = wxEVT_SCROLL_LINEDOWN; - else command = wxEVT_SCROLL_THUMBTRACK; - - int value = (int)ceil(win->m_adjust->value); + const double value = gtk_spin_button_get_value(spinbutton); + const int pos = int(value); + const int oldPos = win->m_pos; + if (g_blockEventsOnDrag || pos == oldPos) + { + win->m_pos = pos; + return; + } - wxSpinEvent event( command, win->GetId()); - event.SetPosition( value ); - event.SetEventObject( win ); + wxSpinEvent event(pos > oldPos ? wxEVT_SCROLL_LINEUP : wxEVT_SCROLL_LINEDOWN, win->GetId()); + event.SetPosition(pos); + event.SetEventObject(win); - if ((win->GetEventHandler()->ProcessEvent( event )) && + if ((win->HandleWindowEvent( event )) && !event.IsAllowed() ) { /* program has vetoed */ - win->m_adjust->value = win->m_oldPos; - - gtk_signal_disconnect_by_func( GTK_OBJECT (win->m_adjust), - (GtkSignalFunc) gtk_spinbutt_callback, - (gpointer) win ); - - gtk_signal_emit_by_name( GTK_OBJECT(win->m_adjust), "value_changed" ); - - gtk_signal_connect( GTK_OBJECT (win->m_adjust), - "value_changed", - (GtkSignalFunc) gtk_spinbutt_callback, - (gpointer) win ); + // this will cause another "value_changed" signal, + // but because pos == oldPos nothing will happen + gtk_spin_button_set_value(spinbutton, oldPos); return; } - win->m_oldPos = win->m_adjust->value; + win->m_pos = pos; /* always send a thumbtrack event */ - if (command != wxEVT_SCROLL_THUMBTRACK) - { - command = wxEVT_SCROLL_THUMBTRACK; - wxSpinEvent event2( command, win->GetId()); - event2.SetPosition( value ); - event2.SetEventObject( win ); - win->GetEventHandler()->ProcessEvent( event2 ); - } + wxSpinEvent event2(wxEVT_SCROLL_THUMBTRACK, win->GetId()); + event2.SetPosition(pos); + event2.SetEventObject(win); + win->HandleWindowEvent(event2); } } @@ -100,13 +72,15 @@ static void gtk_spinbutt_callback( GtkWidget *WXUNUSED(widget), wxSpinButton *wi // wxSpinButton //----------------------------------------------------------------------------- -IMPLEMENT_DYNAMIC_CLASS(wxSpinButton,wxControl) -IMPLEMENT_DYNAMIC_CLASS(wxSpinEvent, wxNotifyEvent) - BEGIN_EVENT_TABLE(wxSpinButton, wxControl) EVT_SIZE(wxSpinButton::OnSize) END_EVENT_TABLE() +wxSpinButton::wxSpinButton() +{ + m_pos = 0; +} + bool wxSpinButton::Create(wxWindow *parent, wxWindowID id, const wxPoint& pos, @@ -114,8 +88,6 @@ bool wxSpinButton::Create(wxWindow *parent, long style, const wxString& name) { - m_needParent = TRUE; - wxSize new_size = size, sizeBest = DoGetBestSize(); new_size.x = sizeBest.x; // override width always @@ -125,99 +97,113 @@ bool wxSpinButton::Create(wxWindow *parent, if (!PreCreation( parent, pos, new_size ) || !CreateBase( parent, id, pos, new_size, style, wxDefaultValidator, name )) { - wxFAIL_MSG( wxT("wxXX creation failed") ); - return FALSE; + wxFAIL_MSG( wxT("wxSpinButton creation failed") ); + return false; } - m_oldPos = 0.0; + m_pos = 0; - m_adjust = (GtkAdjustment*) gtk_adjustment_new( 0.0, 0.0, 100.0, 1.0, 5.0, 0.0); - - m_widget = gtk_spin_button_new( m_adjust, 0, 0 ); + m_widget = gtk_spin_button_new_with_range(0, 100, 1); + g_object_ref(m_widget); gtk_spin_button_set_wrap( GTK_SPIN_BUTTON(m_widget), (int)(m_windowStyle & wxSP_WRAP) ); - gtk_signal_connect( GTK_OBJECT (m_adjust), - "value_changed", - (GtkSignalFunc) gtk_spinbutt_callback, - (gpointer) this ); + g_signal_connect_after( + m_widget, "value_changed", G_CALLBACK(gtk_value_changed), this); m_parent->DoAddChild( this ); PostCreation(new_size); - return TRUE; + return true; } int wxSpinButton::GetMin() const { wxCHECK_MSG( (m_widget != NULL), 0, wxT("invalid spin button") ); - return (int)ceil(m_adjust->lower); + double min; + gtk_spin_button_get_range((GtkSpinButton*)m_widget, &min, NULL); + return int(min); } int wxSpinButton::GetMax() const { wxCHECK_MSG( (m_widget != NULL), 0, wxT("invalid spin button") ); - return (int)ceil(m_adjust->upper); + double max; + gtk_spin_button_get_range((GtkSpinButton*)m_widget, NULL, &max); + return int(max); } int wxSpinButton::GetValue() const { wxCHECK_MSG( (m_widget != NULL), 0, wxT("invalid spin button") ); - return (int)ceil(m_adjust->value); + return m_pos; } void wxSpinButton::SetValue( int value ) { wxCHECK_RET( (m_widget != NULL), wxT("invalid spin button") ); - float fpos = (float)value; - m_oldPos = fpos; - if (fabs(fpos-m_adjust->value) < sensitivity) return; - - m_adjust->value = fpos; - - gtk_signal_emit_by_name( GTK_OBJECT(m_adjust), "value_changed" ); + GtkDisableEvents(); + gtk_spin_button_set_value((GtkSpinButton*)m_widget, value); + m_pos = int(gtk_spin_button_get_value((GtkSpinButton*)m_widget)); + GtkEnableEvents(); } void wxSpinButton::SetRange(int minVal, int maxVal) { wxCHECK_RET( (m_widget != NULL), wxT("invalid spin button") ); - float fmin = (float)minVal; - float fmax = (float)maxVal; + GtkDisableEvents(); + gtk_spin_button_set_range((GtkSpinButton*)m_widget, minVal, maxVal); + m_pos = int(gtk_spin_button_get_value((GtkSpinButton*)m_widget)); + GtkEnableEvents(); +} - if ((fabs(fmin-m_adjust->lower) < sensitivity) && - (fabs(fmax-m_adjust->upper) < sensitivity)) - { - return; - } +void wxSpinButton::OnSize( wxSizeEvent &WXUNUSED(event) ) +{ + wxCHECK_RET( (m_widget != NULL), wxT("invalid spin button") ); + + m_width = DoGetBestSize().x; + gtk_widget_set_size_request( m_widget, m_width, m_height ); +} - m_adjust->lower = fmin; - m_adjust->upper = fmax; +bool wxSpinButton::Enable( bool enable ) +{ + if (!base_type::Enable(enable)) + return false; - gtk_signal_emit_by_name( GTK_OBJECT(m_adjust), "changed" ); + // Work around lack of visual update when enabling + if (enable) + GTKFixSensitivity(false /* fix even if not under mouse */); - // these two calls are required due to some bug in GTK - Refresh(); - SetFocus(); + return true; } -void wxSpinButton::OnSize( wxSizeEvent &WXUNUSED(event) ) +void wxSpinButton::GtkDisableEvents() const { - wxCHECK_RET( (m_widget != NULL), wxT("invalid spin button") ); + g_signal_handlers_block_by_func(m_widget, + (gpointer)gtk_value_changed, (void*) this); +} - m_width = DoGetBestSize().x; - gtk_widget_set_usize( m_widget, m_width, m_height ); +void wxSpinButton::GtkEnableEvents() const +{ + g_signal_handlers_unblock_by_func(m_widget, + (gpointer)gtk_value_changed, (void*) this); } -bool wxSpinButton::IsOwnGtkWindow( GdkWindow *window ) +GdkWindow *wxSpinButton::GTKGetWindow(wxArrayGdkWindows& WXUNUSED(windows)) const { - return GTK_SPIN_BUTTON(m_widget)->panel == window; +#ifdef __WXGTK3__ + // no access to internal GdkWindows + return NULL; +#else + return GTK_SPIN_BUTTON(m_widget)->panel; +#endif } wxSize wxSpinButton::DoGetBestSize() const @@ -231,9 +217,7 @@ wxSize wxSpinButton::DoGetBestSize() const wxVisualAttributes wxSpinButton::GetClassDefaultAttributes(wxWindowVariant WXUNUSED(variant)) { - // TODO: overload to accept functions like gtk_spin_button_new? - // Until then use a similar type - return GetDefaultAttributesFromGTKWidget(gtk_button_new); + return GetDefaultAttributesFromGTKWidget(gtk_spin_button_new_with_range(0, 100, 1)); } #endif