X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/db434467a143a2c847c4bcfe987f0202c2d02bf2..955e46d25d6ac0f9fa55ec9fe11f0c21da3a494d:/src/gtk/spinctrl.cpp diff --git a/src/gtk/spinctrl.cpp b/src/gtk/spinctrl.cpp index 9e51422831..0e91452d8c 100644 --- a/src/gtk/spinctrl.cpp +++ b/src/gtk/spinctrl.cpp @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: spinbutt.cpp +// Name: src/gtk/spinbutt.cpp // Purpose: wxSpinCtrl // Author: Robert // Modified by: @@ -8,29 +8,19 @@ // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// -#ifdef __GNUG__ -#pragma implementation "spinctrl.h" -#endif - -#include "wx/spinctrl.h" +// For compilers that support precompilation, includes "wx.h". +#include "wx/wxprec.h" #if wxUSE_SPINCTRL -#include "wx/utils.h" - -#include - -#include -#include - -//----------------------------------------------------------------------------- -// idle system -//----------------------------------------------------------------------------- +#include "wx/spinctrl.h" -extern void wxapp_install_idle_handler(); -extern bool g_isIdle; +#ifndef WX_PRECOMP + #include "wx/textctrl.h" // for wxEVT_COMMAND_TEXT_UPDATED + #include "wx/utils.h" +#endif -static const float sensitivity = 0.02; +#include "wx/gtk/private.h" //----------------------------------------------------------------------------- // data @@ -42,18 +32,52 @@ extern bool g_blockEventsOnDrag; // "value_changed" //----------------------------------------------------------------------------- -static void gtk_spinctrl_callback( GtkWidget *WXUNUSED(widget), wxSpinCtrl *win ) +extern "C" { +static void +gtk_value_changed(GtkSpinButton* spinbutton, wxSpinCtrl* win) { if (g_isIdle) wxapp_install_idle_handler(); - if (!win->m_hasVMT) return; - if (g_blockEventsOnDrag) return; + win->m_pos = int(gtk_spin_button_get_value(spinbutton)); + if (!win->m_hasVMT || g_blockEventsOnDrag || win->m_blockScrollEvent) + return; wxCommandEvent event( wxEVT_COMMAND_SPINCTRL_UPDATED, win->GetId()); event.SetEventObject( win ); - event.SetInt( win->GetValue() ); + + // 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(win->m_pos); win->GetEventHandler()->ProcessEvent( event ); } +} + +//----------------------------------------------------------------------------- +// "changed" +//----------------------------------------------------------------------------- + +extern "C" { +static void +gtk_changed(GtkSpinButton* spinbutton, wxSpinCtrl* win) +{ + if (g_isIdle) + wxapp_install_idle_handler(); + + if (!win->m_hasVMT || win->m_blockScrollEvent) + return; + + wxCommandEvent event( wxEVT_COMMAND_TEXT_UPDATED, win->GetId() ); + event.SetEventObject( win ); + + // see above + event.SetInt(win->m_pos); + win->GetEventHandler()->ProcessEvent( event ); +} +} //----------------------------------------------------------------------------- // wxSpinCtrl @@ -65,6 +89,11 @@ BEGIN_EVENT_TABLE(wxSpinCtrl, wxControl) EVT_CHAR(wxSpinCtrl::OnChar) END_EVENT_TABLE() +wxSpinCtrl::wxSpinCtrl() +{ + m_pos = 0; +} + bool wxSpinCtrl::Create(wxWindow *parent, wxWindowID id, const wxString& value, const wxPoint& pos, const wxSize& size, @@ -72,90 +101,65 @@ bool wxSpinCtrl::Create(wxWindow *parent, wxWindowID id, int min, int max, int initial, const wxString& name) { - m_needParent = TRUE; - m_acceptsFocus = TRUE; + m_needParent = true; + m_acceptsFocus = true; 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; - - m_adjust = (GtkAdjustment*) gtk_adjustment_new( initial, min, max, 1.0, 5.0, 0.0); + m_widget = gtk_spin_button_new_with_range(min, max, 1); + gtk_spin_button_set_value((GtkSpinButton*)m_widget, initial); + m_pos = int(gtk_spin_button_get_value((GtkSpinButton*)m_widget)); - 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) ); - GtkEnableEvents(); - - m_parent->DoAddChild( this ); - - PostCreation(); - - ApplyWidgetStyle(); - - 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.x != size.x) || (new_size.y != size.y)) - SetSize( new_size.x, new_size.y ); - - SetBackgroundColour( parent->GetBackgroundColour() ); + g_signal_connect(m_widget, "value_changed", G_CALLBACK(gtk_value_changed), this); + g_signal_connect(m_widget, "changed", G_CALLBACK(gtk_changed), this); - SetValue( value ); - - Show( TRUE ); - - return TRUE; -} + m_parent->DoAddChild( this ); -void wxSpinCtrl::GtkDisableEvents() -{ - gtk_signal_disconnect_by_func( GTK_OBJECT(m_adjust), - GTK_SIGNAL_FUNC(gtk_spinctrl_callback), - (gpointer) this ); + PostCreation(size); -} + if (!value.empty()) + { + SetValue(value); + } -void wxSpinCtrl::GtkEnableEvents() -{ - gtk_signal_connect( GTK_OBJECT (m_adjust), - "value_changed", - GTK_SIGNAL_FUNC(gtk_spinctrl_callback), - (gpointer) this ); + return true; } int wxSpinCtrl::GetMin() const { wxCHECK_MSG( (m_widget != NULL), 0, wxT("invalid spin button") ); - return (int)ceil(m_adjust->lower); + double min; + gtk_spin_button_get_range((GtkSpinButton*)m_widget, &min, NULL); + return int(min); } int wxSpinCtrl::GetMax() const { wxCHECK_MSG( (m_widget != NULL), 0, wxT("invalid spin button") ); - return (int)ceil(m_adjust->upper); + double max; + gtk_spin_button_get_range((GtkSpinButton*)m_widget, NULL, &max); + return int(max); } int wxSpinCtrl::GetValue() const { wxCHECK_MSG( (m_widget != NULL), 0, wxT("invalid spin button") ); + wx_const_cast(wxSpinCtrl*, this)->BlockScrollEvent(); gtk_spin_button_update( GTK_SPIN_BUTTON(m_widget) ); + wx_const_cast(wxSpinCtrl*, this)->UnblockScrollEvent(); - return (int)ceil(m_adjust->value); + return m_pos; } void wxSpinCtrl::SetValue( const wxString& value ) @@ -171,9 +175,9 @@ void wxSpinCtrl::SetValue( const wxString& value ) else { // invalid number - set text as is (wxMSW compatible) - GtkDisableEvents(); - gtk_entry_set_text( GTK_ENTRY(m_widget), value.mbc_str() ); - GtkEnableEvents(); + BlockScrollEvent(); + gtk_entry_set_text( GTK_ENTRY(m_widget), wxGTK_CONV( value ) ); + UnblockScrollEvent(); } } @@ -181,76 +185,91 @@ void wxSpinCtrl::SetValue( int value ) { 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; - - GtkDisableEvents(); - gtk_signal_emit_by_name( GTK_OBJECT(m_adjust), "value_changed" ); - GtkEnableEvents(); + BlockScrollEvent(); + gtk_spin_button_set_value((GtkSpinButton*)m_widget, value); + UnblockScrollEvent(); } -void wxSpinCtrl::SetRange(int minVal, int maxVal) +void wxSpinCtrl::SetSelection(long from, long to) { - 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)) + // translate from wxWidgets conventions to GTK+ ones: (-1, -1) means the + // entire range + if ( from == -1 && to == -1 ) { - return; + from = 0; + to = INT_MAX; } - m_adjust->lower = fmin; - m_adjust->upper = fmax; + gtk_editable_select_region( GTK_EDITABLE(m_widget), (gint)from, (gint)to ); +} - gtk_signal_emit_by_name( GTK_OBJECT(m_adjust), "changed" ); +void wxSpinCtrl::SetRange(int minVal, int maxVal) +{ + wxCHECK_RET( (m_widget != NULL), wxT("invalid spin button") ); - // these two calls are required due to some bug in GTK - Refresh(); - SetFocus(); + BlockScrollEvent(); + gtk_spin_button_set_range((GtkSpinButton*)m_widget, minVal, maxVal); + UnblockScrollEvent(); } void wxSpinCtrl::OnChar( wxKeyEvent &event ) { wxCHECK_RET( m_widget != NULL, wxT("invalid spin ctrl") ); - if (event.KeyCode() == WXK_RETURN) + if (event.GetKeyCode() == WXK_RETURN) { - wxWindow *top_frame = m_parent; - while (top_frame->GetParent() && !(top_frame->GetParent()->m_isFrame)) - top_frame = top_frame->GetParent(); - GtkWindow *window = GTK_WINDOW(top_frame->m_widget); + wxWindow *top_frame = wxGetTopLevelParent(m_parent); - if (window->default_widget) + if ( GTK_IS_WINDOW(top_frame->m_widget) ) { - gtk_widget_activate (window->default_widget); - return; + 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 & wxTE_PROCESS_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; + GtkSpinButton* spinbutton = GTK_SPIN_BUTTON(m_widget); + return window == spinbutton->entry.text_area || window == spinbutton->panel; } -void wxSpinCtrl::ApplyWidgetStyle() +wxSize wxSpinCtrl::DoGetBestSize() const { - SetWidgetStyle(); - gtk_widget_set_style( m_widget, m_widgetStyle ); + wxSize ret( wxControl::DoGetBestSize() ); + wxSize best(95, ret.y); + CacheBestSize(best); + return best; } -wxSize wxSpinCtrl::DoGetBestSize() const +// static +wxVisualAttributes +wxSpinCtrl::GetClassDefaultAttributes(wxWindowVariant WXUNUSED(variant)) { - wxSize ret( wxControl::DoGetBestSize() ); - return wxSize(95, ret.y); + // TODO: overload to accept functions like gtk_spin_button_new? + // Until then use a similar type + return GetDefaultAttributesFromGTKWidget(gtk_entry_new, true); } #endif