X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/105fbe1ffa8968cb85fd2cac7192957e522d17ba..6ceeeafd563ff120631f3bb26ee2a2978a46d583:/src/motif/spinbutt.cpp diff --git a/src/motif/spinbutt.cpp b/src/motif/spinbutt.cpp index abee5b0bb6..44c4baf6f0 100644 --- a/src/motif/spinbutt.cpp +++ b/src/motif/spinbutt.cpp @@ -180,8 +180,7 @@ void wxArrowButton::StopTimerCallback( Widget w, XtPointer clientData, return; wxArrowButton* btn = (wxArrowButton*)clientData; - delete btn->m_timer; - btn->m_timer = 0; + wxDELETE(btn->m_timer); } bool wxArrowButton::Create( wxSpinButton* parent, @@ -189,7 +188,7 @@ bool wxArrowButton::Create( wxSpinButton* parent, ArrowDirection d, const wxPoint& pos, const wxSize& size ) { - wxCHECK_MSG( parent, false, _T("must have a valid parent") ); + wxCHECK_MSG( parent, false, wxT("must have a valid parent") ); int arrow_dir = XmARROW_UP; @@ -242,9 +241,6 @@ bool wxArrowButton::Create( wxSpinButton* parent, // wxSpinButton // ---------------------------------------------------------------------------- -IMPLEMENT_DYNAMIC_CLASS(wxSpinButton, wxControl) -IMPLEMENT_DYNAMIC_CLASS(wxSpinEvent, wxNotifyEvent) - static void CalcSizes( const wxPoint& pt, const wxSize& sz, wxPoint& pt1, wxSize& sz1, wxPoint& pt2, wxSize& sz2, @@ -352,7 +348,7 @@ void wxSpinButton::Increment( int delta ) event.SetPosition( npos ); event.SetEventObject( this ); - GetEventHandler()->ProcessEvent( event ); + HandleWindowEvent( event ); if( event.IsAllowed() ) { @@ -360,7 +356,7 @@ void wxSpinButton::Increment( int delta ) event.SetEventType( wxEVT_SCROLL_THUMBTRACK ); event.SetPosition( m_pos ); - GetEventHandler()->ProcessEvent( event ); + HandleWindowEvent( event ); } }