X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/79fb264130d6b8091f2d53dbfdcf64e281444ac7..222702b112dcc7bebe018d6f4d66fe469fefd02c:/src/motif/spinbutt.cpp

diff --git a/src/motif/spinbutt.cpp b/src/motif/spinbutt.cpp
index 2ad0e3b774..cdded68c3a 100644
--- a/src/motif/spinbutt.cpp
+++ b/src/motif/spinbutt.cpp
@@ -9,10 +9,17 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
     #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"
 #include "wx/timer.h"
@@ -74,7 +81,7 @@ class wxArrowButton : public wxControl
 {
     friend class wxArrowButtonTimer;
 public:
-    wxArrowButton( int increment ) 
+    wxArrowButton( int increment )
         : m_increment( increment ),
           m_timer( 0 ) {}
 
@@ -183,7 +190,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 )
     {
@@ -227,7 +234,7 @@ bool wxArrowButton::Create( wxSpinButton* parent, wxWindowID id,
 
     SetForegroundColour( parent->GetBackgroundColour() );
 
-    return TRUE;
+    return true;
 }
 
 // ----------------------------------------------------------------------------
@@ -269,14 +276,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;
@@ -288,7 +293,7 @@ bool wxSpinButton::Create( wxWindow *parent, wxWindowID id,
                                 isVert ? wxARROW_DOWN : wxARROW_LEFT,
                                 pt2, sz2, -1 );
 
-    return TRUE;
+    return true;
 }
 
 wxSpinButton::~wxSpinButton()
@@ -402,3 +407,5 @@ void wxSpinButton::ChangeForegroundColour()
 {
     // TODO
 }
+
+#endif // wxUSE_SPINBTN