X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/07f5b19a15a8664abad7b5176c0260aacbbbc174..8064223b7b1b3657363b7a635c381b9269d95e55:/src/gtk1/spinctrl.cpp diff --git a/src/gtk1/spinctrl.cpp b/src/gtk1/spinctrl.cpp index 80f42b1354..f0beb6ac45 100644 --- a/src/gtk1/spinctrl.cpp +++ b/src/gtk1/spinctrl.cpp @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: spinbutt.cpp +// Name: src/gtk1/spinbutt.cpp // Purpose: wxSpinCtrl // Author: Robert // Modified by: @@ -8,20 +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 "wx/spinctrl.h" -#include +#ifndef WX_PRECOMP + #include "wx/utils.h" + #include "wx/textctrl.h" // for wxEVT_COMMAND_TEXT_UPDATED + #include "wx/math.h" +#endif -#include -#include +#include "wx/gtk1/private.h" //----------------------------------------------------------------------------- // idle system @@ -42,6 +42,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,8 +52,38 @@ 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() ); - win->GetEventHandler()->ProcessEvent( event ); + + // 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->HandleWindowEvent( 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->HandleWindowEvent( event ); +} } //----------------------------------------------------------------------------- @@ -72,14 +103,14 @@ 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; @@ -87,32 +118,19 @@ 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 ); - - 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 ((new_size.x != size.x) || (new_size.y != size.y)) - SetSize( new_size.x, new_size.y ); gtk_spin_button_set_wrap( GTK_SPIN_BUTTON(m_widget), (int)(m_windowStyle & wxSP_WRAP) ); GtkEnableEvents(); - m_parent->DoAddChild( this ); - PostCreation(); + m_parent->DoAddChild( this ); - SetBackgroundColour( parent->GetBackgroundColour() ); + PostCreation(size); SetValue( value ); - Show( TRUE ); - - return TRUE; + return true; } void wxSpinCtrl::GtkDisableEvents() @@ -121,6 +139,9 @@ void wxSpinCtrl::GtkDisableEvents() 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() @@ -129,6 +150,11 @@ void wxSpinCtrl::GtkEnableEvents() "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 @@ -149,6 +175,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); } @@ -166,7 +194,7 @@ void wxSpinCtrl::SetValue( const wxString& value ) { // invalid number - set text as is (wxMSW compatible) GtkDisableEvents(); - gtk_entry_set_text( GTK_ENTRY(m_widget), value.mbc_str() ); + gtk_entry_set_text( GTK_ENTRY(m_widget), wxGTK_CONV( value ) ); GtkEnableEvents(); } } @@ -186,6 +214,19 @@ void wxSpinCtrl::SetValue( int value ) 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) { wxCHECK_RET( (m_widget != NULL), wxT("invalid spin button") ); @@ -213,38 +254,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 & 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 (HandleWindowEvent(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; -void wxSpinCtrl::ApplyWidgetStyle() -{ - SetWidgetStyle(); - gtk_widget_set_style( m_widget, m_widgetStyle ); + if (GTK_SPIN_BUTTON(m_widget)->panel == window) return true; + + return false; } wxSize wxSpinCtrl::DoGetBestSize() const { wxSize ret( wxControl::DoGetBestSize() ); - return wxSize(95, ret.y); + wxSize best(95, ret.y); + CacheBestSize(best); + return best; +} + +// static +wxVisualAttributes +wxSpinCtrl::GetClassDefaultAttributes(wxWindowVariant WXUNUSED(variant)) +{ + // TODO: overload to accept functions like gtk_spin_button_new? + // Until then use a similar type + return GetDefaultAttributesFromGTKWidget(gtk_entry_new, true); } #endif