X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/c0badb709a86b91a203416784b649e3d00c699c7..b50e6e416e2b4cdc849ea6f24181094c0957d904:/src/motif/spinbutt.cpp diff --git a/src/motif/spinbutt.cpp b/src/motif/spinbutt.cpp index 4f32323ea2..fe8e6257b9 100644 --- a/src/motif/spinbutt.cpp +++ b/src/motif/spinbutt.cpp @@ -93,7 +93,7 @@ public: Create( parent, id, d, pos, size ); } - ~wxArrowButton() + virtual ~wxArrowButton() { delete m_timer; } bool Create( wxSpinButton* parent, wxWindowID id, ArrowDirection d, @@ -189,6 +189,8 @@ bool wxArrowButton::Create( wxSpinButton* parent, ArrowDirection d, const wxPoint& pos, const wxSize& size ) { + wxCHECK_MSG( parent, false, wxT("must have a valid parent") ); + int arrow_dir = XmARROW_UP; switch( d ) @@ -207,7 +209,8 @@ bool wxArrowButton::Create( wxSpinButton* parent, break; } - if( parent ) parent->AddChild( this ); + parent->AddChild( this ); + PreCreation(); Widget parentWidget = (Widget) parent->GetClientWidget(); m_mainWidget = (WXWidget) XtVaCreateManagedWidget( "XmArrowButton", @@ -228,11 +231,10 @@ bool wxArrowButton::Create( wxSpinButton* parent, XmNactivateCallback, (XtCallbackProc) StopTimerCallback, (XtPointer) this ); + PostCreation(); AttachWidget( parent, m_mainWidget, (WXWidget) NULL, pos.x, pos.y, size.x, size.y ); - SetForegroundColour( parent->GetBackgroundColour() ); - return true; } @@ -350,7 +352,7 @@ void wxSpinButton::Increment( int delta ) event.SetPosition( npos ); event.SetEventObject( this ); - GetEventHandler()->ProcessEvent( event ); + HandleWindowEvent( event ); if( event.IsAllowed() ) { @@ -358,7 +360,7 @@ void wxSpinButton::Increment( int delta ) event.SetEventType( wxEVT_SCROLL_THUMBTRACK ); event.SetPosition( m_pos ); - GetEventHandler()->ProcessEvent( event ); + HandleWindowEvent( event ); } }