Remove instances where wxGenericImageList is included directly.

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

diff --git a/src/motif/spinbutt.cpp b/src/motif/spinbutt.cpp
index d48978ec077a6ce3eb7e7f82153d6da76b2e67d6..dd10927d967dfa0b4bd1a1586a070dca729c4a3e 100644 (file)
--- a/src/motif/spinbutt.cpp
+++ b/src/motif/spinbutt.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        spinbutt.cpp
+// Name:        src/motif/spinbutt.cpp

 // Purpose:     wxSpinButton
 // Author:      Julian Smart
 // Modified by:
 // Purpose:     wxSpinButton
 // Author:      Julian Smart
 // Modified by:


@@ -9,13 +9,18 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 

-#ifdef __GNUG__
-    #pragma implementation "spinbutt.h"
-#endif
+// For compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"
+
+#if wxUSE_SPINBTN

 
 #include "wx/spinbutt.h"
 
 #include "wx/spinbutt.h"

+
+#ifndef WX_PRECOMP
+    #include "wx/timer.h"
+#endif
+

 #include "wx/spinctrl.h"
 #include "wx/spinctrl.h"

-#include "wx/timer.h"

 
 #ifdef __VMS__
 #pragma message disable nosimpint
 
 #ifdef __VMS__
 #pragma message disable nosimpint


@@ -74,7 +79,7 @@ class wxArrowButton : public wxControl
 {
     friend class wxArrowButtonTimer;
 public:
 {
     friend class wxArrowButtonTimer;
 public:

-    wxArrowButton( int increment ) 
+    wxArrowButton( int increment )

         : m_increment( increment ),
           m_timer( 0 ) {}
 
         : m_increment( increment ),
           m_timer( 0 ) {}
 


@@ -88,7 +93,7 @@ public:
         Create( parent, id, d, pos, size );
     }
 
         Create( parent, id, d, pos, size );
     }
 

-    ~wxArrowButton()
+    virtual ~wxArrowButton()

         { delete m_timer; }
 
     bool Create( wxSpinButton* parent, wxWindowID id, ArrowDirection d,
         { delete m_timer; }
 
     bool Create( wxSpinButton* parent, wxWindowID id, ArrowDirection d,


@@ -179,11 +184,12 @@ void wxArrowButton::StopTimerCallback( Widget w, XtPointer clientData,
     btn->m_timer = 0;
 }
 
     btn->m_timer = 0;
 }
 

-bool wxArrowButton::Create( wxSpinButton* parent, wxWindowID id,
+bool wxArrowButton::Create( wxSpinButton* parent,
+                            wxWindowID WXUNUSED(id),

                             ArrowDirection d,
                             const wxPoint& pos, const wxSize& size )
 {
                             ArrowDirection d,
                             const wxPoint& pos, const wxSize& size )
 {

-    int arrow_dir;
+    int arrow_dir = XmARROW_UP;

 
     switch( d )
     {
 
     switch( d )
     {


@@ -209,6 +215,7 @@ bool wxArrowButton::Create( wxSpinButton* parent, wxWindowID id,
         parentWidget,
         XmNarrowDirection, arrow_dir,
         XmNborderWidth, 0,
         parentWidget,
         XmNarrowDirection, arrow_dir,
         XmNborderWidth, 0,

+        XmNshadowThickness, 0,

         NULL );
 
     XtAddCallback( (Widget) m_mainWidget,
         NULL );
 
     XtAddCallback( (Widget) m_mainWidget,


@@ -224,17 +231,19 @@ bool wxArrowButton::Create( wxSpinButton* parent, wxWindowID id,
     AttachWidget( parent, m_mainWidget, (WXWidget) NULL,
                   pos.x, pos.y, size.x, size.y );
 
     AttachWidget( parent, m_mainWidget, (WXWidget) NULL,
                   pos.x, pos.y, size.x, size.y );
 

-    return TRUE;
+    SetForegroundColour( parent->GetBackgroundColour() );
+
+    return true;

 }
 
 // ----------------------------------------------------------------------------
 // wxSpinButton
 // ----------------------------------------------------------------------------
 
 }
 
 // ----------------------------------------------------------------------------
 // wxSpinButton
 // ----------------------------------------------------------------------------
 

-IMPLEMENT_DYNAMIC_CLASS(wxSpinButton, wxControl);
-IMPLEMENT_DYNAMIC_CLASS(wxSpinEvent, wxNotifyEvent);
+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 )
                        wxPoint& pt1, wxSize& sz1,
                        wxPoint& pt2, wxSize& sz2,
                        bool isVertical )


@@ -266,14 +275,12 @@ bool wxSpinButton::Create( wxWindow *parent, wxWindowID id,
 
     if( !wxControl::Create( parent, id, pos, newSize, style ) )
     {
 
     if( !wxControl::Create( parent, id, pos, newSize, style ) )
     {

-        return FALSE;
+        return false;

     }
 
     SetName(name);
 
     }
 
     SetName(name);
 

-    InitBase();
-
-    m_windowId = ( id == -1 ) ? NewControlId() : id;
+    m_windowId = ( id == wxID_ANY ) ? NewControlId() : id;

 
     bool isVert = IsVertical();
     wxPoint pt1, pt2;
 
     bool isVert = IsVertical();
     wxPoint pt1, pt2;


@@ -285,7 +292,7 @@ bool wxSpinButton::Create( wxWindow *parent, wxWindowID id,
                                 isVert ? wxARROW_DOWN : wxARROW_LEFT,
                                 pt2, sz2, -1 );
 
                                 isVert ? wxARROW_DOWN : wxARROW_LEFT,
                                 pt2, sz2, -1 );
 

-    return TRUE;
+    return true;

 }
 
 wxSpinButton::~wxSpinButton()
 }
 
 wxSpinButton::~wxSpinButton()


@@ -305,19 +312,12 @@ void wxSpinButton::DoMoveWindow(int x, int y, int width, int height)
     m_down->SetSize( pt2.x, pt2.y, sz2.x, sz2.y );
 }
 
     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;
         width = GetSize().x;

-    if( sizeFlags & wxSIZE_USE_EXISTING && height == -1 )
+    if ( (sizeFlags & wxSIZE_ALLOW_MINUS_ONE) && height == -1 )

         height = GetSize().y;
         height = GetSize().y;

-#ifdef __VMS__
-#pragma message enable codcauunr
-#endif

 
     wxControl::DoSetSize(x, y, width, height, 0);
 }
 
     wxControl::DoSetSize(x, y, width, height, 0);
 }


@@ -364,7 +364,7 @@ void wxSpinButton::Increment( int delta )
 
 wxSize wxSpinButton::DoGetBestSize() const
 {
 
 wxSize wxSpinButton::DoGetBestSize() const
 {

-    return IsVertical() ? wxSize( 24, 34 ) : wxSize( 34, 24 );
+    return IsVertical() ? wxSize( 20, 30 ) : wxSize( 30, 20 );

 }
 
 // Attributes
 }
 
 // Attributes


@@ -399,3 +399,5 @@ void wxSpinButton::ChangeForegroundColour()
 {
     // TODO
 }
 {
     // TODO
 }

+
+#endif // wxUSE_SPINBTN