X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/9d9b77552eeb78e0c7ee903aa265dc187651ff57..233387bdcbb1c4f31c54b0fe6b3f03e8d261cab1:/src/gtk/spinctrl.cpp diff --git a/src/gtk/spinctrl.cpp b/src/gtk/spinctrl.cpp index 439794f545..fc1227c39a 100644 --- a/src/gtk/spinctrl.cpp +++ b/src/gtk/spinctrl.cpp @@ -8,9 +8,8 @@ // 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" @@ -18,10 +17,9 @@ #include "wx/utils.h" -#include - -#include -#include +#include "wx/textctrl.h" // for wxEVT_COMMAND_TEXT_UPDATED +#include "wx/math.h" +#include "wx/gtk/private.h" //----------------------------------------------------------------------------- // idle system @@ -42,6 +40,7 @@ extern bool g_blockEventsOnDrag; // "value_changed" //----------------------------------------------------------------------------- +extern "C" { static void gtk_spinctrl_callback( GtkWidget *WXUNUSED(widget), wxSpinCtrl *win ) { if (g_isIdle) wxapp_install_idle_handler(); @@ -51,9 +50,39 @@ static void gtk_spinctrl_callback( GtkWidget *WXUNUSED(widget), wxSpinCtrl *win 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( (int)ceil(win->m_adjust->value) ); + win->GetEventHandler()->ProcessEvent( event ); +} +} + +//----------------------------------------------------------------------------- +// "changed" +//----------------------------------------------------------------------------- + +extern "C" { +static void +gtk_spinctrl_text_changed_callback( GtkWidget *WXUNUSED(widget), wxSpinCtrl *win ) +{ + if (!win->m_hasVMT) return; + + if (g_isIdle) + wxapp_install_idle_handler(); + + 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 ); } +} //----------------------------------------------------------------------------- // wxSpinCtrl @@ -75,15 +104,8 @@ bool wxSpinCtrl::Create(wxWindow *parent, wxWindowID id, m_needParent = TRUE; m_acceptsFocus = TRUE; - wxSize new_size = size, - sizeBest = DoGetBestSize(); - if (new_size.x == -1) - new_size.x = sizeBest.x; - if (new_size.y == -1) - new_size.y = sizeBest.y; - - 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; @@ -98,24 +120,37 @@ bool wxSpinCtrl::Create(wxWindow *parent, wxWindowID id, 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() +{ + g_signal_handlers_disconnect_by_func (m_adjust, + (gpointer) gtk_spinctrl_callback, + this); + g_signal_handlers_disconnect_by_func (m_widget, + (gpointer) gtk_spinctrl_text_changed_callback, + this); +} + +void wxSpinCtrl::GtkEnableEvents() +{ + g_signal_connect (m_adjust, "value_changed", + G_CALLBACK (gtk_spinctrl_callback), + this); + g_signal_connect (m_widget, "changed", + G_CALLBACK (gtk_spinctrl_text_changed_callback), + this); +} + int wxSpinCtrl::GetMin() const { wxCHECK_MSG( (m_widget != NULL), 0, wxT("invalid spin button") ); @@ -134,6 +169,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); } @@ -150,7 +187,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(); } } @@ -164,7 +203,22 @@ void wxSpinCtrl::SetValue( int value ) m_adjust->value = fpos; - gtk_signal_emit_by_name( GTK_OBJECT(m_adjust), "value_changed" ); + GtkDisableEvents(); + g_signal_emit_by_name (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) @@ -183,7 +237,7 @@ void wxSpinCtrl::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(); @@ -194,37 +248,65 @@ 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)) + while (top_frame->GetParent() && !(top_frame->IsTopLevel())) top_frame = top_frame->GetParent(); - GtkWindow *window = GTK_WINDOW(top_frame->m_widget); - 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 & 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; } -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)) { - return wxSize(95, 26); + // TODO: overload to accept functions like gtk_spin_button_new? + // Until then use a similar type + return GetDefaultAttributesFromGTKWidget(gtk_entry_new, true); } #endif