use WX_ASSERT_STR/SIZET_EQUAL instead of CPPUNIT_ASSERT_EQUAL with casts

[wxWidgets.git] / src / motif / spinbutt.cpp

diff --git a/src/motif/spinbutt.cpp b/src/motif/spinbutt.cpp
index 4f32323ea2fc5eb75641db4ed058c4b883e3bcac..abee5b0bb60db18527b15078ad6d32d256f73595 100644 (file)
--- 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, _T("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;
 }