X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/e90c1d2a19361551eb07778280f22be3e759cf64..63a3cd7a8c737eb4571f27e5f2af37eda0f1c5cc:/src/gtk/spinbutt.cpp diff --git a/src/gtk/spinbutt.cpp b/src/gtk/spinbutt.cpp index fd5e0cd865..1088045251 100644 --- a/src/gtk/spinbutt.cpp +++ b/src/gtk/spinbutt.cpp @@ -8,19 +8,16 @@ // 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" -#ifdef wxUSE_SPINBTN +#if wxUSE_SPINBTN #include "wx/utils.h" -#include - -#include "gdk/gdk.h" -#include "gtk/gtk.h" +#include "wx/math.h" +#include "wx/gtk/private.h" //----------------------------------------------------------------------------- // idle system @@ -35,12 +32,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 +48,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 +62,26 @@ 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->GetEventHandler()->ProcessEvent( event )) && + !event.IsAllowed() ) + { + /* program has vetoed */ + win->m_adjust->value = win->m_oldPos; + + g_signal_handlers_disconnect_by_func (win->m_adjust, + (gpointer) gtk_spinbutt_callback, + win); + + g_signal_emit_by_name (win->m_adjust, "value_changed"); + + g_signal_connect (win->m_adjust, "value_changed", + G_CALLBACK (gtk_spinbutt_callback), win); + return; + } + + win->m_oldPos = win->m_adjust->value; + /* always send a thumbtrack event */ if (command != wxEVT_SCROLL_THUMBTRACK) { @@ -77,13 +92,14 @@ static void gtk_spinbutt_callback( GtkWidget *WXUNUSED(widget), wxSpinButton *wi win->GetEventHandler()->ProcessEvent( 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) @@ -98,16 +114,17 @@ bool wxSpinButton::Create(wxWindow *parent, { 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,52 +133,43 @@ 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", - (GtkSignalFunc) gtk_spinbutt_callback, - (gpointer) this ); + g_signal_connect (m_adjust, "value_changed", + G_CALLBACK (gtk_spinbutt_callback), this); m_parent->DoAddChild( this ); - PostCreation(); - - SetBackgroundColour( parent->GetBackgroundColour() ); - - Show( TRUE ); + PostCreation(new_size); return TRUE; } -wxSpinButton::~wxSpinButton() -{ -} - 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; @@ -169,12 +177,12 @@ void wxSpinButton::SetValue( int value ) m_adjust->value = fpos; - gtk_signal_emit_by_name( GTK_OBJECT(m_adjust), "value_changed" ); + g_signal_emit_by_name (m_adjust, "value_changed"); } 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; @@ -188,8 +196,8 @@ void wxSpinButton::SetRange(int minVal, int maxVal) m_adjust->lower = fmin; m_adjust->upper = fmax; - gtk_signal_emit_by_name( GTK_OBJECT(m_adjust), "changed" ); - + g_signal_emit_by_name (m_adjust, "changed"); + // these two calls are required due to some bug in GTK Refresh(); SetFocus(); @@ -197,9 +205,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 +216,20 @@ bool wxSpinButton::IsOwnGtkWindow( GdkWindow *window ) return GTK_SPIN_BUTTON(m_widget)->panel == window; } -void wxSpinButton::ApplyWidgetStyle() +wxSize wxSpinButton::DoGetBestSize() const +{ + wxSize best(15, 26); // FIXME + CacheBestSize(best); + return best; +} + +// static +wxVisualAttributes +wxSpinButton::GetClassDefaultAttributes(wxWindowVariant WXUNUSED(variant)) { - SetWidgetStyle(); - gtk_widget_set_style( m_widget, m_widgetStyle ); + // TODO: overload to accept functions like gtk_spin_button_new? + // Until then use a similar type + return GetDefaultAttributesFromGTKWidget(gtk_button_new); } #endif