X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/7dd62924826c2015d9c2563ce0e9443e73dbddc1..9419b0d64948485ab83122484ffe4b7dcde25905:/src/gtk1/spinctrl.cpp diff --git a/src/gtk1/spinctrl.cpp b/src/gtk1/spinctrl.cpp index 77cc2b8fe5..9820526690 100644 --- a/src/gtk1/spinctrl.cpp +++ b/src/gtk1/spinctrl.cpp @@ -8,20 +8,18 @@ // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// -#ifdef __GNUG__ -#pragma implementation "spinctrl.h" -#endif +// For compilers that support precompilation, includes "wx.h". +#include "wx/wxprec.h" #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 "wx/textctrl.h" // for wxEVT_COMMAND_TEXT_UPDATED +#include "wx/math.h" +#include "wx/gtk1/private.h" //----------------------------------------------------------------------------- // idle system @@ -30,18 +28,19 @@ 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" //----------------------------------------------------------------------------- +extern "C" { static void gtk_spinctrl_callback( GtkWidget *WXUNUSED(widget), wxSpinCtrl *win ) { if (g_isIdle) wxapp_install_idle_handler(); @@ -49,34 +48,40 @@ 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; +extern "C" { +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 ); + + // see above + event.SetInt( (int)ceil(win->m_adjust->value) ); 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 +90,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 +102,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; @@ -111,26 +117,44 @@ bool wxSpinCtrl::Create(wxWindow *parent, wxWindowID id, m_widget = gtk_spin_button_new( m_adjust, 1, 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_spinctrl_callback, - (gpointer) this ); + GtkEnableEvents(); m_parent->DoAddChild( this ); - PostCreation(); - - SetBackgroundColour( parent->GetBackgroundColour() ); + PostCreation(size); SetValue( value ); - Show( TRUE ); - 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 +173,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 +191,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.mbc_str() ); + GtkDisableEvents(); + gtk_entry_set_text( GTK_ENTRY(m_widget), wxGTK_CONV( value ) ); + GtkEnableEvents(); } } @@ -179,7 +207,22 @@ void wxSpinCtrl::SetValue( int value ) m_adjust->value = fpos; + GtkDisableEvents(); gtk_signal_emit_by_name( GTK_OBJECT(m_adjust), "value_changed" ); + GtkEnableEvents(); +} + +void wxSpinCtrl::SetSelection(long from, long to) +{ + // translate from wxWidgets conventions to GTK+ ones: (-1, -1) means the + // entire range + if ( from == -1 && to == -1 ) + { + from = 0; + to = INT_MAX; + } + + gtk_editable_select_region( GTK_EDITABLE(m_widget), (gint)from, (gint)to ); } void wxSpinCtrl::SetRange(int minVal, int maxVal) @@ -199,21 +242,76 @@ 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.GetKeyCode() == WXK_RETURN) + { + wxWindow *top_frame = m_parent; + while (top_frame->GetParent() && !(top_frame->IsTopLevel())) + top_frame = top_frame->GetParent(); + + if ( GTK_IS_WINDOW(top_frame->m_widget) ) + { + GtkWindow *window = GTK_WINDOW(top_frame->m_widget); + if ( window ) + { + GtkWidget *widgetDef = window->default_widget; + + if ( widgetDef ) + { + gtk_widget_activate(widgetDef); + return; + } + } + } + } + + if ((event.GetKeyCode() == WXK_RETURN) && (m_windowStyle & wxPROCESS_ENTER)) + { + wxCommandEvent evt( wxEVT_COMMAND_TEXT_ENTER, m_windowId ); + evt.SetEventObject(this); + GtkSpinButton *gsb = GTK_SPIN_BUTTON(m_widget); + wxString val = wxGTK_CONV_BACK( gtk_entry_get_text( &gsb->entry ) ); + evt.SetString( val ); + if (GetEventHandler()->ProcessEvent(evt)) return; + } + + event.Skip(); +} + bool wxSpinCtrl::IsOwnGtkWindow( GdkWindow *window ) { - return GTK_SPIN_BUTTON(m_widget)->panel == window; + if (GTK_SPIN_BUTTON(m_widget)->entry.text_area == window) return TRUE; + + if (GTK_SPIN_BUTTON(m_widget)->panel == window) return TRUE; + + return FALSE; +} + +wxSize wxSpinCtrl::DoGetBestSize() const +{ + wxSize ret( wxControl::DoGetBestSize() ); + wxSize best(95, ret.y); + CacheBestSize(best); + return best; } -void wxSpinCtrl::ApplyWidgetStyle() +// static +wxVisualAttributes +wxSpinCtrl::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_entry_new, true); } #endif + // wxUSE_SPINCTRL