X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/355b4d3de54b76db87439fa2142c7334a6e48f85..cf2227623a889dd0a5f36288d346fc6bf64b55fa:/src/motif/spinbutt.cpp?ds=sidebyside diff --git a/src/motif/spinbutt.cpp b/src/motif/spinbutt.cpp index e742ea7be4..44c4baf6f0 100644 --- a/src/motif/spinbutt.cpp +++ b/src/motif/spinbutt.cpp @@ -12,13 +12,15 @@ // For compilers that support precompilation, includes "wx.h". #include "wx/wxprec.h" -#include "wx/defs.h" - #if wxUSE_SPINBTN #include "wx/spinbutt.h" + +#ifndef WX_PRECOMP + #include "wx/timer.h" +#endif + #include "wx/spinctrl.h" -#include "wx/timer.h" #ifdef __VMS__ #pragma message disable nosimpint @@ -91,7 +93,7 @@ public: Create( parent, id, d, pos, size ); } - ~wxArrowButton() + virtual ~wxArrowButton() { delete m_timer; } bool Create( wxSpinButton* parent, wxWindowID id, ArrowDirection d, @@ -178,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, @@ -187,6 +188,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 ) @@ -205,7 +208,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", @@ -226,11 +230,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; } @@ -238,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, @@ -310,19 +310,12 @@ void wxSpinButton::DoMoveWindow(int x, int y, int width, int height) m_down->SetSize( pt2.x, pt2.y, sz2.x, sz2.y ); } -void wxSpinButton::DoSetSize(int x, int y, int width, int height, - int sizeFlags) +void wxSpinButton::DoSetSize(int x, int y, int width, int height, int sizeFlags) { -#ifdef __VMS__ -#pragma message disable codcauunr -#endif - if( sizeFlags & wxSIZE_USE_EXISTING && width == -1 ) + if ( (sizeFlags & wxSIZE_ALLOW_MINUS_ONE) && width == -1 ) width = GetSize().x; - if( sizeFlags & wxSIZE_USE_EXISTING && height == -1 ) + if ( (sizeFlags & wxSIZE_ALLOW_MINUS_ONE) && height == -1 ) height = GetSize().y; -#ifdef __VMS__ -#pragma message enable codcauunr -#endif wxControl::DoSetSize(x, y, width, height, 0); } @@ -355,7 +348,7 @@ void wxSpinButton::Increment( int delta ) event.SetPosition( npos ); event.SetEventObject( this ); - GetEventHandler()->ProcessEvent( event ); + HandleWindowEvent( event ); if( event.IsAllowed() ) { @@ -363,7 +356,7 @@ void wxSpinButton::Increment( int delta ) event.SetEventType( wxEVT_SCROLL_THUMBTRACK ); event.SetPosition( m_pos ); - GetEventHandler()->ProcessEvent( event ); + HandleWindowEvent( event ); } }