X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/8907154c1a8a6882c6797d1f16393ddfb23e7f3a..f915b92e09ce8df3b8967900af2180ab36db2ed0:/src/gtk1/spinbutt.cpp diff --git a/src/gtk1/spinbutt.cpp b/src/gtk1/spinbutt.cpp index b91d902de2..250fda3d2a 100644 --- a/src/gtk1/spinbutt.cpp +++ b/src/gtk1/spinbutt.cpp @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: spinbutt.cpp +// Name: src/gtk1/spinbutt.cpp // Purpose: wxSpinButton // Author: Robert // Modified by: @@ -11,13 +11,16 @@ // For compilers that support precompilation, includes "wx.h". #include "wx/wxprec.h" +#if wxUSE_SPINBTN + #include "wx/spinbutt.h" -#if wxUSE_SPINBTN +#ifndef WX_PRECOMP + #include "wx/utils.h" + #include "wx/math.h" +#endif -#include "wx/utils.h" -#include "wx/math.h" -#include "wx/gtk/private.h" +#include "wx/gtk1/private.h" //----------------------------------------------------------------------------- // idle system @@ -63,7 +66,7 @@ static void gtk_spinbutt_callback( GtkWidget *WXUNUSED(widget), wxSpinButton *wi event.SetPosition( value ); event.SetEventObject( win ); - if ((win->GetEventHandler()->ProcessEvent( event )) && + if ((win->HandleWindowEvent( event )) && !event.IsAllowed() ) { /* program has vetoed */ @@ -91,7 +94,7 @@ static void gtk_spinbutt_callback( GtkWidget *WXUNUSED(widget), wxSpinButton *wi wxSpinEvent event2( command, win->GetId()); event2.SetPosition( value ); event2.SetEventObject( win ); - win->GetEventHandler()->ProcessEvent( event2 ); + win->HandleWindowEvent( event2 ); } } } @@ -114,7 +117,7 @@ bool wxSpinButton::Create(wxWindow *parent, long style, const wxString& name) { - m_needParent = TRUE; + m_needParent = true; wxSize new_size = size, sizeBest = DoGetBestSize(); @@ -126,7 +129,7 @@ bool wxSpinButton::Create(wxWindow *parent, !CreateBase( parent, id, pos, new_size, style, wxDefaultValidator, name )) { wxFAIL_MSG( wxT("wxXX creation failed") ); - return FALSE; + return false; } m_oldPos = 0.0; @@ -147,7 +150,7 @@ bool wxSpinButton::Create(wxWindow *parent, PostCreation(new_size); - return TRUE; + return true; } int wxSpinButton::GetMin() const @@ -236,4 +239,4 @@ wxSpinButton::GetClassDefaultAttributes(wxWindowVariant WXUNUSED(variant)) return GetDefaultAttributesFromGTKWidget(gtk_button_new); } -#endif +#endif // wxUSE_SPINBTN