X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/ce89fdd22ecbaf29569e70733d76c8f1eaca391e..7df9fbc3f11f6239ed7417964c0c50ea77b7b7e7:/src/gtk/spinctrl.cpp diff --git a/src/gtk/spinctrl.cpp b/src/gtk/spinctrl.cpp index 7b40f4ccbe..f4458a7584 100644 --- a/src/gtk/spinctrl.cpp +++ b/src/gtk/spinctrl.cpp @@ -14,14 +14,14 @@ #include "wx/spinctrl.h" -#ifdef wxUSE_SPINBTN +#if wxUSE_SPINCTRL #include "wx/utils.h" -#include "wx/spinbutt.h" + #include -#include "gdk/gdk.h" -#include "gtk/gtk.h" +#include +#include //----------------------------------------------------------------------------- // idle system @@ -30,14 +30,14 @@ extern void wxapp_install_idle_handler(); extern bool g_isIdle; +static const float sensitivity = 0.02; + //----------------------------------------------------------------------------- // data //----------------------------------------------------------------------------- extern bool g_blockEventsOnDrag; -static const float sensitivity = 0.02; - //----------------------------------------------------------------------------- // "value_changed" //----------------------------------------------------------------------------- @@ -49,34 +49,35 @@ static void gtk_spinctrl_callback( GtkWidget *WXUNUSED(widget), wxSpinCtrl *win if (!win->m_hasVMT) return; if (g_blockEventsOnDrag) return; - float diff = win->m_adjust->value - win->m_oldPos; - if (fabs(diff) < sensitivity) return; - win->m_oldPos = win->m_adjust->value; + wxCommandEvent event( wxEVT_COMMAND_SPINCTRL_UPDATED, win->GetId()); + event.SetEventObject( win ); - wxEventType command = wxEVT_NULL; + // note that we don't use wxSpinCtrl::GetValue() here because it would + // adjust the value to fit into the control range and this means that we + // would never be able to enter an "invalid" value in the control, even + // temporarily - and trying to enter 10 into the control which accepts the + // values in range 5..50 is then, ummm, quite challenging (hint: you can't + // enter 1!) (VZ) + event.SetInt( (int)ceil(win->m_adjust->value) ); + win->GetEventHandler()->ProcessEvent( event ); +} - float line_step = win->m_adjust->step_increment; +//----------------------------------------------------------------------------- +// "changed" +//----------------------------------------------------------------------------- - if (fabs(diff-line_step) < sensitivity) command = wxEVT_SCROLL_LINEDOWN; - else if (fabs(diff+line_step) < sensitivity) command = wxEVT_SCROLL_LINEUP; - else command = wxEVT_SCROLL_THUMBTRACK; +static void +gtk_spinctrl_text_changed_callback( GtkWidget *WXUNUSED(widget), wxSpinCtrl *win ) +{ + if (!win->m_hasVMT) return; - int value = (int)ceil(win->m_adjust->value); + if (g_isIdle) + wxapp_install_idle_handler(); - wxSpinEvent event( command, win->GetId()); - event.SetPosition( value ); + wxCommandEvent event( wxEVT_COMMAND_TEXT_UPDATED, win->GetId() ); event.SetEventObject( win ); + event.SetInt( win->GetValue() ); win->GetEventHandler()->ProcessEvent( event ); - - /* 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 ); - } } //----------------------------------------------------------------------------- @@ -85,6 +86,10 @@ static void gtk_spinctrl_callback( GtkWidget *WXUNUSED(widget), wxSpinCtrl *win IMPLEMENT_DYNAMIC_CLASS(wxSpinCtrl,wxControl) +BEGIN_EVENT_TABLE(wxSpinCtrl, wxControl) + EVT_CHAR(wxSpinCtrl::OnChar) +END_EVENT_TABLE() + bool wxSpinCtrl::Create(wxWindow *parent, wxWindowID id, const wxString& value, const wxPoint& pos, const wxSize& size, @@ -93,16 +98,13 @@ bool wxSpinCtrl::Create(wxWindow *parent, wxWindowID id, const wxString& name) { m_needParent = TRUE; + m_acceptsFocus = TRUE; - wxSize new_size = size; - if (new_size.y == -1) - new_size.y = 26; - - if (!PreCreation( parent, pos, new_size ) || - !CreateBase( parent, id, pos, new_size, style, wxDefaultValidator, name )) + if (!PreCreation( parent, pos, size ) || + !CreateBase( parent, id, pos, size, style, wxDefaultValidator, name )) { wxFAIL_MSG( wxT("wxSpinCtrl creation failed") ); - return FALSE; + return FALSE; } m_oldPos = initial; @@ -110,18 +112,29 @@ bool wxSpinCtrl::Create(wxWindow *parent, wxWindowID id, m_adjust = (GtkAdjustment*) gtk_adjustment_new( initial, min, max, 1.0, 5.0, 0.0); m_widget = gtk_spin_button_new( m_adjust, 1, 0 ); + + gtk_spin_button_set_wrap( GTK_SPIN_BUTTON(m_widget), + (int)(m_windowStyle & wxSP_WRAP) ); - 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_spinctrl_callback, - (gpointer) this ); - + GtkEnableEvents(); + m_parent->DoAddChild( this ); PostCreation(); + SetFont( parent->GetFont() ); + + wxSize size_best( DoGetBestSize() ); + wxSize new_size( size ); + if (new_size.x == -1) + new_size.x = size_best.x; + if (new_size.y == -1) + new_size.y = size_best.y; + if (new_size.y > size_best.y) + new_size.y = size_best.y; + if ((new_size.x != size.x) || (new_size.y != size.y)) + SetSize( new_size.x, new_size.y ); + SetBackgroundColour( parent->GetBackgroundColour() ); SetValue( value ); @@ -131,6 +144,30 @@ bool wxSpinCtrl::Create(wxWindow *parent, wxWindowID id, return TRUE; } +void wxSpinCtrl::GtkDisableEvents() +{ + gtk_signal_disconnect_by_func( GTK_OBJECT(m_adjust), + GTK_SIGNAL_FUNC(gtk_spinctrl_callback), + (gpointer) this ); + + gtk_signal_disconnect_by_func( GTK_OBJECT(m_widget), + GTK_SIGNAL_FUNC(gtk_spinctrl_text_changed_callback), + (gpointer) this ); +} + +void wxSpinCtrl::GtkEnableEvents() +{ + gtk_signal_connect( GTK_OBJECT (m_adjust), + "value_changed", + GTK_SIGNAL_FUNC(gtk_spinctrl_callback), + (gpointer) this ); + + gtk_signal_connect( GTK_OBJECT(m_widget), + "changed", + GTK_SIGNAL_FUNC(gtk_spinctrl_text_changed_callback), + (gpointer)this); +} + int wxSpinCtrl::GetMin() const { wxCHECK_MSG( (m_widget != NULL), 0, wxT("invalid spin button") ); @@ -149,6 +186,8 @@ int wxSpinCtrl::GetValue() const { wxCHECK_MSG( (m_widget != NULL), 0, wxT("invalid spin button") ); + gtk_spin_button_update( GTK_SPIN_BUTTON(m_widget) ); + return (int)ceil(m_adjust->value); } @@ -165,7 +204,9 @@ void wxSpinCtrl::SetValue( const wxString& value ) else { // invalid number - set text as is (wxMSW compatible) - gtk_entry_set_text( GTK_ENTRY(m_widget), value.c_str() ); + GtkDisableEvents(); + gtk_entry_set_text( GTK_ENTRY(m_widget), value.mbc_str() ); + GtkEnableEvents(); } } @@ -179,7 +220,9 @@ void wxSpinCtrl::SetValue( int value ) m_adjust->value = fpos; + GtkDisableEvents(); gtk_signal_emit_by_name( GTK_OBJECT(m_adjust), "value_changed" ); + GtkEnableEvents(); } void wxSpinCtrl::SetRange(int minVal, int maxVal) @@ -199,12 +242,33 @@ void wxSpinCtrl::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(); } +void wxSpinCtrl::OnChar( wxKeyEvent &event ) +{ + wxCHECK_RET( m_widget != NULL, wxT("invalid spin ctrl") ); + + if (event.KeyCode() == WXK_RETURN) + { + wxWindow *top_frame = m_parent; + while (top_frame->GetParent() && !(top_frame->GetParent()->IsTopLevel())) + top_frame = top_frame->GetParent(); + GtkWindow *window = GTK_WINDOW(top_frame->m_widget); + + if (window->default_widget) + { + gtk_widget_activate (window->default_widget); + return; + } + } + + event.Skip(); +} + bool wxSpinCtrl::IsOwnGtkWindow( GdkWindow *window ) { return GTK_SPIN_BUTTON(m_widget)->panel == window; @@ -216,4 +280,11 @@ void wxSpinCtrl::ApplyWidgetStyle() gtk_widget_set_style( m_widget, m_widgetStyle ); } +wxSize wxSpinCtrl::DoGetBestSize() const +{ + wxSize ret( wxControl::DoGetBestSize() ); + return wxSize(95, ret.y); +} + #endif + // wxUSE_SPINCTRL