X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/8e13c1ec4e6e8d2c5852df39c6be5db4fd279227..f239a20092359e3c914adb79bd39f3f5d2b2e06f:/src/gtk1/spinctrl.cpp diff --git a/src/gtk1/spinctrl.cpp b/src/gtk1/spinctrl.cpp index e0c8046cfa..9bfab34a2b 100644 --- a/src/gtk1/spinctrl.cpp +++ b/src/gtk1/spinctrl.cpp @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: src/gtk1/spinbutt.cpp +// Name: src/gtk1/spinctrl.cpp // Purpose: wxSpinCtrl // Author: Robert // Modified by: @@ -11,14 +11,16 @@ // 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/spinctrl.h" + +#ifndef WX_PRECOMP + #include "wx/utils.h" + #include "wx/textctrl.h" // for wxEVT_COMMAND_TEXT_UPDATED + #include "wx/math.h" +#endif -#include "wx/textctrl.h" // for wxEVT_COMMAND_TEXT_UPDATED -#include "wx/math.h" #include "wx/gtk1/private.h" //----------------------------------------------------------------------------- @@ -58,7 +60,7 @@ 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 ); } } @@ -80,7 +82,7 @@ gtk_spinctrl_text_changed_callback( GtkWidget *WXUNUSED(widget), wxSpinCtrl *win // see above event.SetInt( (int)ceil(win->m_adjust->value) ); - win->GetEventHandler()->ProcessEvent( event ); + win->HandleWindowEvent( event ); } } @@ -88,8 +90,6 @@ gtk_spinctrl_text_changed_callback( GtkWidget *WXUNUSED(widget), wxSpinCtrl *win // wxSpinCtrl //----------------------------------------------------------------------------- -IMPLEMENT_DYNAMIC_CLASS(wxSpinCtrl,wxControl) - BEGIN_EVENT_TABLE(wxSpinCtrl, wxControl) EVT_CHAR(wxSpinCtrl::OnChar) END_EVENT_TABLE() @@ -281,7 +281,7 @@ void wxSpinCtrl::OnChar( wxKeyEvent &event ) 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();