X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/510fc784c0c7002488bcaad881901176554f7c32..82a99c692ccec70172d65b6e04c1ad9730ead888:/src/gtk/spinbutt.cpp diff --git a/src/gtk/spinbutt.cpp b/src/gtk/spinbutt.cpp index 38f4d4c28a..25c26b63a0 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: @@ -8,28 +8,18 @@ // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// -#ifdef __GNUG__ - #pragma implementation "spinbutt.h" - #pragma implementation "spinbutbase.h" -#endif - -#include "wx/spinbutt.h" - -#ifdef wxUSE_SPINBTN - -#include "wx/utils.h" +// For compilers that support precompilation, includes "wx.h". +#include "wx/wxprec.h" -#include +#if wxUSE_SPINBTN -#include -#include +#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 "wx/gtk/private.h" //----------------------------------------------------------------------------- // data @@ -37,66 +27,47 @@ extern bool g_isIdle; extern bool g_blockEventsOnDrag; -static const float sensitivity = 0.02; - //----------------------------------------------------------------------------- // "value_changed" //----------------------------------------------------------------------------- -static void gtk_spinbutt_callback( GtkWidget *WXUNUSED(widget), wxSpinButton *win ) +extern "C" { +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 (!win->m_hasVMT || g_blockEventsOnDrag || win->m_blockScrollEvent || 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 )) && !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 ); + win->BlockScrollEvent(); + gtk_spin_button_set_value(spinbutton, oldPos); + win->UnblockScrollEvent(); 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->GetEventHandler()->ProcessEvent(event2); +} } //----------------------------------------------------------------------------- @@ -104,12 +75,17 @@ static void gtk_spinbutt_callback( GtkWidget *WXUNUSED(widget), wxSpinButton *wi //----------------------------------------------------------------------------- IMPLEMENT_DYNAMIC_CLASS(wxSpinButton,wxControl) -IMPLEMENT_DYNAMIC_CLASS(wxSpinEvent, wxScrollEvent); +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, @@ -117,7 +93,7 @@ bool wxSpinButton::Create(wxWindow *parent, long style, const wxString& name) { - m_needParent = TRUE; + m_needParent = true; wxSize new_size = size, sizeBest = DoGetBestSize(); @@ -128,90 +104,68 @@ 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_adjust = (GtkAdjustment*) gtk_adjustment_new( 0.0, 0.0, 100.0, 1.0, 5.0, 0.0); + m_pos = 0; - m_widget = gtk_spin_button_new( m_adjust, 0, 0 ); + m_widget = gtk_spin_button_new_with_range(0, 100, 1); 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(); - - SetBackgroundColour( parent->GetBackgroundColour() ); + PostCreation(new_size); - Show( TRUE ); - - 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" ); + BlockScrollEvent(); + gtk_spin_button_set_value((GtkSpinButton*)m_widget, value); + UnblockScrollEvent(); } void wxSpinButton::SetRange(int minVal, int maxVal) { wxCHECK_RET( (m_widget != NULL), wxT("invalid spin button") ); - float fmin = (float)minVal; - float fmax = (float)maxVal; - - if ((fabs(fmin-m_adjust->lower) < sensitivity) && - (fabs(fmax-m_adjust->upper) < sensitivity)) - { - return; - } - - m_adjust->lower = fmin; - m_adjust->upper = fmax; - - gtk_signal_emit_by_name( GTK_OBJECT(m_adjust), "changed" ); - - // these two calls are required due to some bug in GTK - Refresh(); - SetFocus(); + BlockScrollEvent(); + gtk_spin_button_set_range((GtkSpinButton*)m_widget, minVal, maxVal); + UnblockScrollEvent(); } void wxSpinButton::OnSize( wxSizeEvent &WXUNUSED(event) ) @@ -219,23 +173,28 @@ void wxSpinButton::OnSize( wxSizeEvent &WXUNUSED(event) ) wxCHECK_RET( (m_widget != NULL), wxT("invalid spin button") ); m_width = DoGetBestSize().x; - gtk_widget_set_usize( m_widget, m_width, m_height ); + gtk_widget_set_size_request( m_widget, m_width, m_height ); } -bool wxSpinButton::IsOwnGtkWindow( GdkWindow *window ) +GdkWindow *wxSpinButton::GTKGetWindow(wxArrayGdkWindows& WXUNUSED(windows)) const { - return GTK_SPIN_BUTTON(m_widget)->panel == window; + return GTK_SPIN_BUTTON(m_widget)->panel; } -void wxSpinButton::ApplyWidgetStyle() +wxSize wxSpinButton::DoGetBestSize() const { - SetWidgetStyle(); - gtk_widget_set_style( m_widget, m_widgetStyle ); + wxSize best(15, 26); // FIXME + CacheBestSize(best); + return best; } -wxSize wxSpinButton::DoGetBestSize() const +// static +wxVisualAttributes +wxSpinButton::GetClassDefaultAttributes(wxWindowVariant WXUNUSED(variant)) { - return wxSize(15, 26); + // TODO: overload to accept functions like gtk_spin_button_new? + // Until then use a similar type + return GetDefaultAttributesFromGTKWidget(gtk_button_new); } #endif