// 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
Create( parent, id, d, pos, size );
}
- ~wxArrowButton()
+ virtual ~wxArrowButton()
{ delete m_timer; }
bool Create( wxSpinButton* parent, wxWindowID id, ArrowDirection d,
return;
wxArrowButton* btn = (wxArrowButton*)clientData;
- delete btn->m_timer;
- btn->m_timer = 0;
+ wxDELETE(btn->m_timer);
}
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 )
break;
}
- if( parent ) parent->AddChild( this );
+ parent->AddChild( this );
+ PreCreation();
Widget parentWidget = (Widget) parent->GetClientWidget();
m_mainWidget = (WXWidget) XtVaCreateManagedWidget( "XmArrowButton",
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;
}
// wxSpinButton
// ----------------------------------------------------------------------------
-IMPLEMENT_DYNAMIC_CLASS(wxSpinButton, wxControl);
-IMPLEMENT_DYNAMIC_CLASS(wxSpinEvent, wxNotifyEvent);
+IMPLEMENT_DYNAMIC_CLASS(wxSpinButton, wxControl)
+IMPLEMENT_DYNAMIC_CLASS(wxSpinEvent, wxNotifyEvent)
static void CalcSizes( const wxPoint& pt, const wxSize& sz,
wxPoint& pt1, wxSize& sz1,
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);
}
event.SetPosition( npos );
event.SetEventObject( this );
- GetEventHandler()->ProcessEvent( event );
+ HandleWindowEvent( event );
if( event.IsAllowed() )
{
event.SetEventType( wxEVT_SCROLL_THUMBTRACK );
event.SetPosition( m_pos );
- GetEventHandler()->ProcessEvent( event );
+ HandleWindowEvent( event );
}
}