Also allow key events for Shift-Tab when wxWANTS_CHARS style is used

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

diff --git a/src/univ/spinbutt.cpp b/src/univ/spinbutt.cpp
index 07808d336a95c939357645805e59c8914db62453..a9428daa3072ccbe9d93754dea6bfadb77cbca4c 100644 (file)
--- a/src/univ/spinbutt.cpp
+++ b/src/univ/spinbutt.cpp
@@ -17,7 +17,7 @@
 // headers
 // ----------------------------------------------------------------------------
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
     #pragma implementation "spinbutt.h"
     #pragma implementation "univspinbutt.h"
 #endif
@@ -144,14 +144,14 @@ int wxSpinButton::NormalizeValue(int value) const
     if ( value > m_max )
     {
         if ( GetWindowStyleFlag() & wxSP_WRAP )
-            value = m_min + (value - m_max) % (m_max - m_min);
+            value = m_min + (value - m_max - 1) % (m_max - m_min + 1);
         else
             value = m_max;
     }
     else if ( value < m_min )
     {
         if ( GetWindowStyleFlag() & wxSP_WRAP )
-            value = m_max - (m_min - value) % (m_max - m_min);
+            value = m_max - (m_min - value - 1) % (m_max - m_min + 1);
         else
             value = m_min;
     }