fixed warnings about truncating 64 bit integers

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

diff --git a/src/motif/spinbutt.cpp b/src/motif/spinbutt.cpp
index 99bebdfee045e4f0e8cdef44080589d51550a867..f01ea0a2a4234bc8203e75cba96131c4f9cf6d41 100644 (file)
--- a/src/motif/spinbutt.cpp
+++ b/src/motif/spinbutt.cpp
@@ -9,9 +9,12 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-#ifdef __GNUG__
-    #pragma implementation "spinbutt.h"
-#endif
+// For compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"
+
+#include "wx/defs.h"
+
+#if wxUSE_SPINBTN
 
 #include "wx/spinbutt.h"
 #include "wx/spinctrl.h"
@@ -74,7 +77,7 @@ class wxArrowButton : public wxControl
 {
     friend class wxArrowButtonTimer;
 public:
-    wxArrowButton( int increment ) 
+    wxArrowButton( int increment )
         : m_increment( increment ),
           m_timer( 0 ) {}
 
@@ -183,7 +186,7 @@ bool wxArrowButton::Create( wxSpinButton* parent, wxWindowID id,
                             ArrowDirection d,
                             const wxPoint& pos, const wxSize& size )
 {
-    int arrow_dir;
+    int arrow_dir = XmARROW_UP;
 
     switch( d )
     {
@@ -225,7 +228,9 @@ bool wxArrowButton::Create( wxSpinButton* parent, wxWindowID id,
     AttachWidget( parent, m_mainWidget, (WXWidget) NULL,
                   pos.x, pos.y, size.x, size.y );
 
-    return TRUE;
+    SetForegroundColour( parent->GetBackgroundColour() );
+
+    return true;
 }
 
 // ----------------------------------------------------------------------------
@@ -235,7 +240,7 @@ bool wxArrowButton::Create( wxSpinButton* parent, wxWindowID id,
 IMPLEMENT_DYNAMIC_CLASS(wxSpinButton, wxControl);
 IMPLEMENT_DYNAMIC_CLASS(wxSpinEvent, wxNotifyEvent);
 
-static void CalcSizes( wxPoint pt, wxSize sz,
+static void CalcSizes( const wxPoint& pt, const wxSize& sz,
                        wxPoint& pt1, wxSize& sz1,
                        wxPoint& pt2, wxSize& sz2,
                        bool isVertical )
@@ -267,14 +272,12 @@ bool wxSpinButton::Create( wxWindow *parent, wxWindowID id,
 
     if( !wxControl::Create( parent, id, pos, newSize, style ) )
     {
-        return FALSE;
+        return false;
     }
 
     SetName(name);
 
-    InitBase();
-
-    m_windowId = ( id == -1 ) ? NewControlId() : id;
+    m_windowId = ( id == wxID_ANY ) ? NewControlId() : id;
 
     bool isVert = IsVertical();
     wxPoint pt1, pt2;
@@ -286,7 +289,7 @@ bool wxSpinButton::Create( wxWindow *parent, wxWindowID id,
                                 isVert ? wxARROW_DOWN : wxARROW_LEFT,
                                 pt2, sz2, -1 );
 
-    return TRUE;
+    return true;
 }
 
 wxSpinButton::~wxSpinButton()
@@ -400,3 +403,5 @@ void wxSpinButton::ChangeForegroundColour()
 {
     // TODO
 }
+
+#endif // wxUSE_SPINBTN