setting clipping correctly

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

diff --git a/src/motif/spinbutt.cpp b/src/motif/spinbutt.cpp
index e742ea7be40439b682115b43363b23c174a67a64..dd10927d967dfa0b4bd1a1586a070dca729c4a3e 100644 (file)
--- a/src/motif/spinbutt.cpp
+++ b/src/motif/spinbutt.cpp
@@ -12,13 +12,15 @@
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 

-#include "wx/defs.h"
-

 #if wxUSE_SPINBTN
 
 #include "wx/spinbutt.h"
 #if wxUSE_SPINBTN
 
 #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


@@ -91,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,


@@ -238,8 +240,8 @@ bool wxArrowButton::Create( wxSpinButton* parent,
 // 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( const wxPoint& pt, const wxSize& sz,
                        wxPoint& pt1, wxSize& sz1,
 
 static void CalcSizes( const wxPoint& pt, const wxSize& sz,
                        wxPoint& pt1, wxSize& sz1,


@@ -310,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);
 }