X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/f8f9ec5563b78655cfb49f501f0fda306e831642..dd9f8b6bb6935360a8271dc3e8749fb026b601a8:/src/gtk1/spinctrl.cpp?ds=sidebyside diff --git a/src/gtk1/spinctrl.cpp b/src/gtk1/spinctrl.cpp index ff4ee9faeb..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,24 +8,20 @@ // 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_COMMAND_TEXT_UPDATED + #include "wx/math.h" +#endif -#include "wx/gtk/private.h" +#include "wx/gtk1/private.h" //----------------------------------------------------------------------------- // idle system @@ -46,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(); @@ -63,13 +60,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 ) { @@ -80,10 +79,11 @@ gtk_spinctrl_text_changed_callback( GtkWidget *WXUNUSED(widget), wxSpinCtrl *win 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 ); + win->HandleWindowEvent( event ); +} } //----------------------------------------------------------------------------- @@ -103,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; @@ -118,33 +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 ); - + gtk_spin_button_set_wrap( GTK_SPIN_BUTTON(m_widget), (int)(m_windowStyle & wxSP_WRAP) ); GtkEnableEvents(); - - m_parent->DoAddChild( this ); - PostCreation(); - InheritAttributes(); + m_parent->DoAddChild( this ); - 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.y > size_best.y) - new_size.y = size_best.y; - if ((new_size.x != size.x) || (new_size.y != size.y)) - SetSize( new_size.x, new_size.y ); + PostCreation(size); SetValue( value ); - Show( TRUE ); - - return TRUE; + return true; } void wxSpinCtrl::GtkDisableEvents() @@ -164,7 +150,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), @@ -230,7 +216,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 ) { @@ -271,7 +257,7 @@ void wxSpinCtrl::OnChar( wxKeyEvent &event ) if (event.GetKeyCode() == WXK_RETURN) { wxWindow *top_frame = m_parent; - while (top_frame->GetParent() && !(top_frame->GetParent()->IsTopLevel())) + while (top_frame->GetParent() && !(top_frame->IsTopLevel())) top_frame = top_frame->GetParent(); if ( GTK_IS_WINDOW(top_frame->m_widget) ) @@ -281,7 +267,7 @@ void wxSpinCtrl::OnChar( wxKeyEvent &event ) { GtkWidget *widgetDef = window->default_widget; - if ( widgetDef && GTK_IS_WINDOW(widgetDef) ) + if ( widgetDef ) { gtk_widget_activate(widgetDef); return; @@ -290,28 +276,43 @@ void wxSpinCtrl::OnChar( wxKeyEvent &event ) } } + 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 ) { - 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; +} + +// 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