X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/9d522606d0a1dfd22bcdc1a386b3dca01fa985e3..12bb29f5432174ecbd65549bda832d70d34a98ae:/src/gtk1/spinctrl.cpp?ds=sidebyside diff --git a/src/gtk1/spinctrl.cpp b/src/gtk1/spinctrl.cpp index 45cc31f6b8..275077ee32 100644 --- a/src/gtk1/spinctrl.cpp +++ b/src/gtk1/spinctrl.cpp @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: spinbutt.cpp +// Name: src/gtk1/spinctrl.cpp // Purpose: wxSpinCtrl // Author: Robert // Modified by: @@ -8,24 +8,21 @@ // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// -#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) -#pragma implementation "spinctrl.h" -#endif - // For compilers that support precompilation, includes "wx.h". #include "wx/wxprec.h" -#include "wx/spinctrl.h" - #if wxUSE_SPINCTRL -#include "wx/utils.h" - -#include "wx/textctrl.h" // for wxEVT_COMMAND_TEXT_UPDATED +#include "wx/spinctrl.h" -#include +#ifndef WX_PRECOMP + #include "wx/utils.h" + #include "wx/textctrl.h" // for wxEVT_TEXT + #include "wx/math.h" + #include "wx/crt.h" +#endif -#include "wx/gtk/private.h" +#include "wx/gtk1/private.h" //----------------------------------------------------------------------------- // idle system @@ -46,6 +43,39 @@ extern bool g_blockEventsOnDrag; // "value_changed" //----------------------------------------------------------------------------- +extern "C" { + +static gboolean +wx_gtk_spin_input(GtkSpinButton* spin, gdouble* val, wxSpinCtrl* win) +{ + // We might use g_ascii_strtoll() here but it's 2.12+ only, so use our own + // wxString function even if this requires an extra conversion. + const wxString + text(wxString::FromUTF8(gtk_entry_get_text(GTK_ENTRY(spin)))); + + long lval; + if ( !text.ToLong(&lval, win->GetBase()) ) + return FALSE; + + *val = lval; + + return TRUE; +} + +static gint +wx_gtk_spin_output(GtkSpinButton* spin, wxSpinCtrl* win) +{ + const gint val = gtk_spin_button_get_value_as_int(spin); + + gtk_entry_set_text + ( + GTK_ENTRY(spin), + wxPrivate::wxSpinCtrlFormatAsHex(val, win->GetMax()).utf8_str() + ); + + return TRUE; +} + static void gtk_spinctrl_callback( GtkWidget *WXUNUSED(widget), wxSpinCtrl *win ) { if (g_isIdle) wxapp_install_idle_handler(); @@ -53,7 +83,7 @@ static void gtk_spinctrl_callback( GtkWidget *WXUNUSED(widget), wxSpinCtrl *win if (!win->m_hasVMT) return; if (g_blockEventsOnDrag) return; - wxCommandEvent event( wxEVT_COMMAND_SPINCTRL_UPDATED, win->GetId()); + wxCommandEvent event( wxEVT_SPINCTRL, win->GetId()); event.SetEventObject( win ); // note that we don't use wxSpinCtrl::GetValue() here because it would @@ -63,13 +93,15 @@ static void gtk_spinctrl_callback( GtkWidget *WXUNUSED(widget), wxSpinCtrl *win // 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 ); + win->HandleWindowEvent( event ); +} } //----------------------------------------------------------------------------- // "changed" //----------------------------------------------------------------------------- +extern "C" { static void gtk_spinctrl_text_changed_callback( GtkWidget *WXUNUSED(widget), wxSpinCtrl *win ) { @@ -78,20 +110,19 @@ gtk_spinctrl_text_changed_callback( GtkWidget *WXUNUSED(widget), wxSpinCtrl *win if (g_isIdle) wxapp_install_idle_handler(); - wxCommandEvent event( wxEVT_COMMAND_TEXT_UPDATED, win->GetId() ); + wxCommandEvent event( wxEVT_TEXT, win->GetId() ); event.SetEventObject( win ); - + // see above event.SetInt( (int)ceil(win->m_adjust->value) ); - win->GetEventHandler()->ProcessEvent( event ); + win->HandleWindowEvent( event ); +} } //----------------------------------------------------------------------------- // wxSpinCtrl //----------------------------------------------------------------------------- -IMPLEMENT_DYNAMIC_CLASS(wxSpinCtrl,wxControl) - BEGIN_EVENT_TABLE(wxSpinCtrl, wxControl) EVT_CHAR(wxSpinCtrl::OnChar) END_EVENT_TABLE() @@ -103,14 +134,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; @@ -118,19 +149,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 ); - + gtk_spin_button_set_wrap( GTK_SPIN_BUTTON(m_widget), (int)(m_windowStyle & wxSP_WRAP) ); GtkEnableEvents(); - + m_parent->DoAddChild( this ); PostCreation(size); SetValue( value ); - return TRUE; + return true; } void wxSpinCtrl::GtkDisableEvents() @@ -150,7 +181,7 @@ 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), @@ -216,7 +247,7 @@ void wxSpinCtrl::SetValue( int value ) void wxSpinCtrl::SetSelection(long from, long to) { - // translate from wxWindows conventions to GTK+ ones: (-1, -1) means the + // translate from wxWidgets conventions to GTK+ ones: (-1, -1) means the // entire range if ( from == -1 && to == -1 ) { @@ -276,14 +307,14 @@ void wxSpinCtrl::OnChar( wxKeyEvent &event ) } } - if ((event.GetKeyCode() == WXK_RETURN) && (m_windowStyle & wxPROCESS_ENTER)) + if ((event.GetKeyCode() == WXK_RETURN) && (m_windowStyle & wxTE_PROCESS_ENTER)) { - wxCommandEvent evt( wxEVT_COMMAND_TEXT_ENTER, m_windowId ); + wxCommandEvent evt( wxEVT_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; + if (HandleWindowEvent(evt)) return; } event.Skip(); @@ -291,23 +322,55 @@ void wxSpinCtrl::OnChar( wxKeyEvent &event ) bool wxSpinCtrl::IsOwnGtkWindow( GdkWindow *window ) { - if (GTK_SPIN_BUTTON(m_widget)->entry.text_area == window) return TRUE; - - if (GTK_SPIN_BUTTON(m_widget)->panel == window) return TRUE; + if (GTK_SPIN_BUTTON(m_widget)->entry.text_area == window) return true; - return FALSE; -} + if (GTK_SPIN_BUTTON(m_widget)->panel == window) return true; -void wxSpinCtrl::ApplyWidgetStyle() -{ - SetWidgetStyle(); - gtk_widget_set_style( m_widget, m_widgetStyle ); + return false; } wxSize wxSpinCtrl::DoGetBestSize() const { wxSize ret( wxControl::DoGetBestSize() ); - return wxSize(95, ret.y); + wxSize best(95, ret.y); + CacheBestSize(best); + return best; +} + +bool wxSpinCtrl::SetBase(int base) +{ + // Currently we only support base 10 and 16. We could add support for base + // 8 quite easily but wxMSW doesn't support it natively so don't bother + // with doing something wxGTK-specific here. + if ( base != 10 && base != 16 ) + return false; + + if ( base == m_base ) + return true; + + m_base = base; + + // We need to be able to enter letters for any base greater than 10. + gtk_spin_button_set_numeric( GTK_SPIN_BUTTON(m_widget), m_base <= 10 ); + + if ( m_base != 10 ) + { + gtk_signal_connect( GTK_OBJECT(m_widget), "input", + GTK_SIGNAL_FUNC(wx_gtk_spin_input), this); + gtk_signal_connect( GTK_OBJECT(m_widget), "output", + GTK_SIGNAL_FUNC(wx_gtk_spin_output), this); + } + else + { + gtk_signal_disconnect_by_func(GTK_OBJECT(m_widget), + GTK_SIGNAL_FUNC(wx_gtk_spin_input), + this); + gtk_signal_disconnect_by_func(GTK_OBJECT(m_widget), + GTK_SIGNAL_FUNC(wx_gtk_spin_output), + this); + } + + return true; } // static