compilation fix for wxUSE_INTL == 0 (patch 646466)

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

diff --git a/src/motif/spinbutt.cpp b/src/motif/spinbutt.cpp
index b0f2e76d94121d04dd28b03fa63b260b6c6f2881..ba88785d9b4e73c5a1f9d4a7c01eff72f0b3ef64 100644 (file)
--- a/src/motif/spinbutt.cpp
+++ b/src/motif/spinbutt.cpp
@@ -208,6 +208,7 @@ bool wxArrowButton::Create( wxSpinButton* parent, wxWindowID id,
         xmArrowButtonWidgetClass,
         parentWidget,
         XmNarrowDirection, arrow_dir,
+        XmNborderWidth, 0,
         NULL );
 
     XtAddCallback( (Widget) m_mainWidget,
@@ -307,14 +308,16 @@ void wxSpinButton::DoMoveWindow(int x, int y, int width, int height)
 void wxSpinButton::DoSetSize(int x, int y, int width, int height,
                              int sizeFlags)
 {
-    if( sizeFlags & wxSIZE_AUTO_WIDTH && width == -1 )
-        width = 30;
-    if( sizeFlags & wxSIZE_AUTO_HEIGHT && height == -1 )
-        height = 30;
+#ifdef __VMS__
+#pragma message disable codcauunr
+#endif
     if( sizeFlags & wxSIZE_USE_EXISTING && width == -1 )
         width = GetSize().x;
     if( sizeFlags & wxSIZE_USE_EXISTING && height == -1 )
         height = GetSize().y;
+#ifdef __VMS__
+#pragma message enable codcauunr
+#endif
 
     wxControl::DoSetSize(x, y, width, height, 0);
 }
@@ -326,8 +329,20 @@ void wxSpinButton::Increment( int delta )
 
     int npos = m_pos + delta;
 
-    if( npos < m_min ) npos = m_min;
-    if( npos > m_max ) npos = m_max;
+    if( npos < m_min )
+    {
+        if( GetWindowStyle() && wxSP_WRAP )
+            npos = m_max;
+        else
+            npos = m_min;
+    }
+    if( npos > m_max )
+    {
+        if( GetWindowStyle() && wxSP_WRAP )
+            npos = m_min;
+        else
+            npos = m_max;
+    }
     if( npos == m_pos ) return;
 
     wxSpinEvent event( delta > 0 ? wxEVT_SCROLL_LINEUP : wxEVT_SCROLL_LINEDOWN,