X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/9750fc4245cf539981863964183754a930632f19..c5288c5cfebea56239369dddcce8ac3ef6f4a8dd:/src/gtk/spinctrl.cpp?ds=sidebyside diff --git a/src/gtk/spinctrl.cpp b/src/gtk/spinctrl.cpp index 10651bf765..d14e452c6c 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,20 @@ // 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" + #include "wx/wxcrtvararg.h" +#endif -static const float sensitivity = 0.02; +#include "wx/gtk/private.h" //----------------------------------------------------------------------------- // data @@ -42,18 +33,48 @@ 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 (!win->m_hasVMT || win->m_blockScrollEvent) + return; + + wxCommandEvent event( wxEVT_COMMAND_TEXT_UPDATED, win->GetId() ); + event.SetEventObject( win ); + event.SetString( GTK_ENTRY(spinbutton)->text ); + + // see above + event.SetInt(win->m_pos); + win->GetEventHandler()->ProcessEvent( event ); +} +} //----------------------------------------------------------------------------- // wxSpinCtrl @@ -65,6 +86,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,66 +98,62 @@ bool wxSpinCtrl::Create(wxWindow *parent, wxWindowID id, int min, int max, int initial, 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; - - 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 ); + 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)); 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 ); + g_signal_connect_after(m_widget, "value_changed", G_CALLBACK(gtk_value_changed), this); + g_signal_connect_after(m_widget, "changed", G_CALLBACK(gtk_changed), this); m_parent->DoAddChild( this ); - PostCreation(); + PostCreation(size); - SetBackgroundColour( parent->GetBackgroundColour() ); - - SetValue( value ); - - Show( TRUE ); + if (!value.empty()) + { + SetValue(value); + } - return TRUE; + 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") ); - return (int)ceil(m_adjust->value); + GtkDisableEvents(); + gtk_spin_button_update( GTK_SPIN_BUTTON(m_widget) ); + GtkEnableEvents(); + + return m_pos; } void wxSpinCtrl::SetValue( const wxString& value ) @@ -147,7 +169,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(); } } @@ -155,68 +179,114 @@ 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; + GtkDisableEvents(); + gtk_spin_button_set_value((GtkSpinButton*)m_widget, value); + GtkEnableEvents(); +} - m_adjust->value = fpos; +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_signal_emit_by_name( GTK_OBJECT(m_adjust), "value_changed" ); + gtk_editable_select_region( GTK_EDITABLE(m_widget), (gint)from, (gint)to ); } void wxSpinCtrl::SetRange(int minVal, int maxVal) { 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)) - { - return; - } + GtkDisableEvents(); + gtk_spin_button_set_range((GtkSpinButton*)m_widget, minVal, maxVal); + GtkEnableEvents(); +} - m_adjust->lower = fmin; - m_adjust->upper = fmax; - gtk_signal_emit_by_name( GTK_OBJECT(m_adjust), "changed" ); +void wxSpinCtrl::GtkDisableEvents() const +{ + g_signal_handlers_block_by_func( m_widget, + (gpointer)gtk_value_changed, (void*) this); + + g_signal_handlers_block_by_func(m_widget, + (gpointer)gtk_changed, (void*) this); +} - // these two calls are required due to some bug in GTK - Refresh(); - SetFocus(); +void wxSpinCtrl::GtkEnableEvents() const +{ + g_signal_handlers_unblock_by_func(m_widget, + (gpointer)gtk_value_changed, (void*) this); + + g_signal_handlers_unblock_by_func(m_widget, + (gpointer)gtk_changed, (void*) this); } 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 ) +GdkWindow *wxSpinCtrl::GTKGetWindow(wxArrayGdkWindows& windows) const +{ + GtkSpinButton* spinbutton = GTK_SPIN_BUTTON(m_widget); + + windows.push_back(spinbutton->entry.text_area); + windows.push_back(spinbutton->panel); + + return NULL; +} + +wxSize wxSpinCtrl::DoGetBestSize() const { - return GTK_SPIN_BUTTON(m_widget)->panel == window; + wxSize ret( wxControl::DoGetBestSize() ); + wxSize best(95, ret.y); // FIXME: 95? + 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