X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/65045edde4a36217aebb214d841b658f28eb6ac7..86e4f8ad085fa0d179e3f1ccb5b03c3471a11cec:/src/gtk1/spinbutt.cpp diff --git a/src/gtk1/spinbutt.cpp b/src/gtk1/spinbutt.cpp index 762d4cc3be..250fda3d2a 100644 --- a/src/gtk1/spinbutt.cpp +++ b/src/gtk1/spinbutt.cpp @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: spinbutt.cpp +// Name: src/gtk1/spinbutt.cpp // Purpose: wxSpinButton // Author: Robert // Modified by: @@ -8,19 +8,19 @@ // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// -#ifdef __GNUG__ -#pragma implementation "spinbutt.h" -#endif +// For compilers that support precompilation, includes "wx.h". +#include "wx/wxprec.h" -#include "wx/spinbutt.h" +#if wxUSE_SPINBTN -#ifdef wxUSE_SPINBTN +#include "wx/spinbutt.h" -#include "wx/utils.h" -#include +#ifndef WX_PRECOMP + #include "wx/utils.h" + #include "wx/math.h" +#endif -#include "gdk/gdk.h" -#include "gtk/gtk.h" +#include "wx/gtk1/private.h" //----------------------------------------------------------------------------- // idle system @@ -35,12 +35,13 @@ extern bool g_isIdle; extern bool g_blockEventsOnDrag; -static const float sensitivity = 0.2; +static const float sensitivity = 0.02; //----------------------------------------------------------------------------- // "value_changed" //----------------------------------------------------------------------------- +extern "C" { static void gtk_spinbutt_callback( GtkWidget *WXUNUSED(widget), wxSpinButton *win ) { if (g_isIdle) wxapp_install_idle_handler(); @@ -50,14 +51,13 @@ static void gtk_spinbutt_callback( GtkWidget *WXUNUSED(widget), wxSpinButton *wi float diff = win->m_adjust->value - win->m_oldPos; if (fabs(diff) < sensitivity) return; - win->m_oldPos = win->m_adjust->value; wxEventType command = wxEVT_NULL; float line_step = win->m_adjust->step_increment; - if (fabs(diff-line_step) < sensitivity) command = wxEVT_SCROLL_LINEDOWN; - else if (fabs(diff+line_step) < sensitivity) command = wxEVT_SCROLL_LINEUP; + 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); @@ -65,8 +65,28 @@ static void gtk_spinbutt_callback( GtkWidget *WXUNUSED(widget), wxSpinButton *wi wxSpinEvent event( command, win->GetId()); event.SetPosition( value ); event.SetEventObject( win ); - 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 ); + return; + } + + win->m_oldPos = win->m_adjust->value; + /* always send a thumbtrack event */ if (command != wxEVT_SCROLL_THUMBTRACK) { @@ -74,16 +94,17 @@ static void gtk_spinbutt_callback( GtkWidget *WXUNUSED(widget), wxSpinButton *wi wxSpinEvent event2( command, win->GetId()); event2.SetPosition( value ); event2.SetEventObject( win ); - win->GetEventHandler()->ProcessEvent( event2 ); + win->HandleWindowEvent( event2 ); } } +} //----------------------------------------------------------------------------- // wxSpinButton //----------------------------------------------------------------------------- IMPLEMENT_DYNAMIC_CLASS(wxSpinButton,wxControl) -IMPLEMENT_DYNAMIC_CLASS(wxSpinEvent, wxScrollEvent); +IMPLEMENT_DYNAMIC_CLASS(wxSpinEvent, wxNotifyEvent) BEGIN_EVENT_TABLE(wxSpinButton, wxControl) EVT_SIZE(wxSpinButton::OnSize) @@ -96,18 +117,19 @@ bool wxSpinButton::Create(wxWindow *parent, long style, const wxString& name) { - m_needParent = TRUE; + m_needParent = true; - wxSize new_size = size; - new_size.x = 15; + wxSize new_size = size, + sizeBest = DoGetBestSize(); + new_size.x = sizeBest.x; // override width always if (new_size.y == -1) - new_size.y = 30; + new_size.y = sizeBest.y; if (!PreCreation( parent, pos, new_size ) || !CreateBase( parent, id, pos, new_size, style, wxDefaultValidator, name )) { - wxFAIL_MSG( _T("wxXX creation failed") ); - return FALSE; + wxFAIL_MSG( wxT("wxXX creation failed") ); + return false; } m_oldPos = 0.0; @@ -116,7 +138,8 @@ bool wxSpinButton::Create(wxWindow *parent, 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_spin_button_set_wrap( GTK_SPIN_BUTTON(m_widget), + (int)(m_windowStyle & wxSP_WRAP) ); gtk_signal_connect( GTK_OBJECT (m_adjust), "value_changed", @@ -125,43 +148,35 @@ bool wxSpinButton::Create(wxWindow *parent, m_parent->DoAddChild( this ); - PostCreation(); - - SetBackgroundColour( parent->GetBackgroundColour() ); + PostCreation(new_size); - Show( TRUE ); - - return TRUE; -} - -wxSpinButton::~wxSpinButton() -{ + return true; } int wxSpinButton::GetMin() const { - wxCHECK_MSG( (m_widget != NULL), 0, _T("invalid spin button") ); + 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, _T("invalid spin button") ); + 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, _T("invalid spin button") ); + 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), _T("invalid spin button") ); + wxCHECK_RET( (m_widget != NULL), wxT("invalid spin button") ); float fpos = (float)value; m_oldPos = fpos; @@ -174,7 +189,7 @@ void wxSpinButton::SetValue( int value ) void wxSpinButton::SetRange(int minVal, int maxVal) { - wxCHECK_RET( (m_widget != NULL), _T("invalid spin button") ); + wxCHECK_RET( (m_widget != NULL), wxT("invalid spin button") ); float fmin = (float)minVal; float fmax = (float)maxVal; @@ -189,7 +204,7 @@ void wxSpinButton::SetRange(int minVal, int maxVal) 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(); @@ -197,9 +212,9 @@ void wxSpinButton::SetRange(int minVal, int maxVal) void wxSpinButton::OnSize( wxSizeEvent &WXUNUSED(event) ) { - wxCHECK_RET( (m_widget != NULL), _T("invalid spin button") ); + wxCHECK_RET( (m_widget != NULL), wxT("invalid spin button") ); - m_width = 15; + m_width = DoGetBestSize().x; gtk_widget_set_usize( m_widget, m_width, m_height ); } @@ -208,10 +223,20 @@ bool wxSpinButton::IsOwnGtkWindow( GdkWindow *window ) return GTK_SPIN_BUTTON(m_widget)->panel == window; } -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; } -#endif +// static +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); +} + +#endif // wxUSE_SPINBTN