X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/8e18907799c4b338607b4d57861f97266431b01d..2d4b5a5e99d62f6e6fd127f8afb4e551aa9aceac:/src/gtk/spinbutt.cpp diff --git a/src/gtk/spinbutt.cpp b/src/gtk/spinbutt.cpp index 83eb28ec50..2688602473 100644 --- a/src/gtk/spinbutt.cpp +++ b/src/gtk/spinbutt.cpp @@ -5,53 +5,97 @@ // Modified by: // RCS-ID: $Id$ // Copyright: (c) Robert Roebling -// Licence: wxWindows licence +// Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// #ifdef __GNUG__ -#pragma implementation "spinbutt.h" + #pragma implementation "spinbutt.h" + #pragma implementation "spinbutbase.h" #endif #include "wx/spinbutt.h" + +#if wxUSE_SPINBTN + #include "wx/utils.h" +#include + +#include "wx/gtk/private.h" + +//----------------------------------------------------------------------------- +// idle system +//----------------------------------------------------------------------------- + +extern void wxapp_install_idle_handler(); +extern bool g_isIdle; + //----------------------------------------------------------------------------- // data //----------------------------------------------------------------------------- extern bool g_blockEventsOnDrag; +static const float sensitivity = 0.02; + //----------------------------------------------------------------------------- // "value_changed" //----------------------------------------------------------------------------- static void gtk_spinbutt_callback( GtkWidget *WXUNUSED(widget), wxSpinButton *win ) -{ - if (!win->HasVMT()) return; - if (g_blockEventsOnDrag) return; - - float diff = win->m_adjust->value - win->m_oldPos; - if (fabs(diff) < 0.2) return; - - wxEventType command = wxEVT_NULL; - - float line_step = win->m_adjust->step_increment; - float page_step = win->m_adjust->page_increment; - - if (fabs(diff-line_step) < 0.2) command = wxEVT_SCROLL_LINEDOWN; - else if (fabs(diff+line_step) < 0.2) command = wxEVT_SCROLL_LINEUP; - else if (fabs(diff-page_step) < 0.2) command = wxEVT_SCROLL_PAGEDOWN; - else if (fabs(diff+page_step) < 0.2) command = wxEVT_SCROLL_PAGEUP; - else command = wxEVT_SCROLL_THUMBTRACK; - - int value = (int)(win->m_adjust->value+0.5); - - wxSpinEvent event( command, win->GetId()); - event.SetPosition( value ); - event.SetOrientation( wxVERTICAL ); - event.SetEventObject( win ); - - win->ProcessEvent( event ); +{ + 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); + + wxSpinEvent event( command, win->GetId()); + event.SetPosition( value ); + 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 ); + return; + } + + win->m_oldPos = win->m_adjust->value; + + /* 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 ); + } } //----------------------------------------------------------------------------- @@ -59,134 +103,138 @@ static void gtk_spinbutt_callback( GtkWidget *WXUNUSED(widget), wxSpinButton *wi //----------------------------------------------------------------------------- IMPLEMENT_DYNAMIC_CLASS(wxSpinButton,wxControl) +IMPLEMENT_DYNAMIC_CLASS(wxSpinEvent, wxNotifyEvent) BEGIN_EVENT_TABLE(wxSpinButton, wxControl) EVT_SIZE(wxSpinButton::OnSize) END_EVENT_TABLE() -wxSpinButton::wxSpinButton() +bool wxSpinButton::Create(wxWindow *parent, + wxWindowID id, + const wxPoint& pos, + const wxSize& size, + long style, + const wxString& name) { -} + m_needParent = TRUE; -bool wxSpinButton::Create(wxWindow *parent, wxWindowID id, const wxPoint& pos, const wxSize& size, - long style, const wxString& name) -{ - m_needParent = TRUE; - - wxSize new_size = size; - new_size.x = 16; - if (new_size.y == -1) new_size.y = 30; - - PreCreation( parent, id, pos, new_size, style, name ); - -// SetValidator( validator ); - - m_oldPos = 0.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 ); - - gtk_spin_button_set_wrap( GTK_SPIN_BUTTON(m_widget), (m_windowStyle & wxSP_WRAP) ); - - gtk_signal_connect (GTK_OBJECT (m_adjust), "value_changed", - (GtkSignalFunc) gtk_spinbutt_callback, (gpointer) this ); - - m_parent->AddChild( this ); - - (m_parent->m_insertCallback)( m_parent, this ); - - PostCreation(); - - SetBackgroundColour( parent->GetBackgroundColour() ); - - Show( TRUE ); - - return TRUE; -} + wxSize new_size = size, + sizeBest = DoGetBestSize(); + new_size.x = sizeBest.x; // override width always + if (new_size.y == -1) + new_size.y = sizeBest.y; -wxSpinButton::~wxSpinButton() -{ + if (!PreCreation( parent, pos, new_size ) || + !CreateBase( parent, id, pos, new_size, style, wxDefaultValidator, name )) + { + wxFAIL_MSG( wxT("wxXX 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_widget = gtk_spin_button_new( m_adjust, 0, 0 ); + + 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 ); + + m_parent->DoAddChild( this ); + + PostCreation(); + + SetBackgroundColour( parent->GetBackgroundColour() ); + + Show( TRUE ); + + return TRUE; } int wxSpinButton::GetMin() const { - wxCHECK_MSG( (m_widget != NULL), 0, "invalid spin button" ); - - return (int)(m_adjust->lower+0.5); + wxCHECK_MSG( (m_widget != NULL), 0, wxT("invalid spin button") ); + + return (int)ceil(m_adjust->lower); } int wxSpinButton::GetMax() const { - wxCHECK_MSG( (m_widget != NULL), 0, "invalid spin button" ); - - return (int)(m_adjust->upper+0.5); + wxCHECK_MSG( (m_widget != NULL), 0, wxT("invalid spin button") ); + + return (int)ceil(m_adjust->upper); } int wxSpinButton::GetValue() const { - wxCHECK_MSG( (m_widget != NULL), 0, "invalid spin button" ); - - return (int)(m_adjust->value+0.5); + wxCHECK_MSG( (m_widget != NULL), 0, wxT("invalid spin button") ); + + return (int)ceil(m_adjust->value); } void wxSpinButton::SetValue( int value ) { - wxCHECK_RET( (m_widget != NULL), "invalid spin button" ); - - float fpos = (float)value; - m_oldPos = fpos; - if (fabs(fpos-m_adjust->value) < 0.2) return; - m_adjust->value = fpos; - - gtk_signal_emit_by_name( GTK_OBJECT(m_adjust), "value_changed" ); + 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" ); } void wxSpinButton::SetRange(int minVal, int maxVal) { - wxCHECK_RET( (m_widget != NULL), "invalid spin button" ); - - float fmin = (float)minVal; - float fmax = (float)maxVal; - - if ((fabs(fmin-m_adjust->lower) < 0.2) && - (fabs(fmax-m_adjust->upper) < 0.2)) - return; - - m_adjust->lower = fmin; - m_adjust->upper = fmax; - - gtk_signal_emit_by_name( GTK_OBJECT(m_adjust), "changed" ); + 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(); } void wxSpinButton::OnSize( wxSizeEvent &WXUNUSED(event) ) { - wxCHECK_RET( (m_widget != NULL), "invalid spin button" ); - - m_width = 16; - gtk_widget_set_usize( m_widget, m_width, m_height ); + wxCHECK_RET( (m_widget != NULL), wxT("invalid spin button") ); + + m_width = DoGetBestSize().x; + gtk_widget_set_usize( m_widget, m_width, m_height ); } bool wxSpinButton::IsOwnGtkWindow( GdkWindow *window ) { - return GTK_SPIN_BUTTON(m_widget)->panel == window; + return GTK_SPIN_BUTTON(m_widget)->panel == window; } void wxSpinButton::ApplyWidgetStyle() { - SetWidgetStyle(); - gtk_widget_set_style( m_widget, m_widgetStyle ); + SetWidgetStyle(); + gtk_widget_set_style( m_widget, m_widgetStyle ); } -//----------------------------------------------------------------------------- -// wxSpinEvent -//----------------------------------------------------------------------------- - -IMPLEMENT_DYNAMIC_CLASS(wxSpinEvent, wxScrollEvent) - -wxSpinEvent::wxSpinEvent(wxEventType commandType, int id): - wxScrollEvent(commandType, id) +wxSize wxSpinButton::DoGetBestSize() const { + return wxSize(15, 26); } - +#endif