try to clear the device/logical unit fog; remove unused and unsupported (an assertion...

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

diff --git a/src/msw/spinbutt.cpp b/src/msw/spinbutt.cpp
index 73395991b81a6e29c2948a9c7f22a3a0990f0b23..1695f13436805fa056c7197b5f72558cf3bb5ebe 100644 (file)
--- a/src/msw/spinbutt.cpp
+++ b/src/msw/spinbutt.cpp
@@ -25,6 +25,7 @@
 #endif
 
 #ifndef WX_PRECOMP
+    #include "wx/msw/wrapcctl.h" // include <commctrl.h> "properly"
     #include "wx/app.h"
 #endif
 
@@ -35,7 +36,6 @@
 IMPLEMENT_DYNAMIC_CLASS(wxSpinEvent, wxNotifyEvent)
 
 #include "wx/msw/private.h"
-#include "wx/msw/wrapcctl.h"
 
 #ifndef UDM_SETRANGE32
     #define UDM_SETRANGE32 (WM_USER+111)
@@ -96,7 +96,7 @@ wxEND_FLAGS( wxSpinButtonStyle )
 IMPLEMENT_DYNAMIC_CLASS_XTI(wxSpinButton, wxControl,"wx/spinbut.h")
 
 wxBEGIN_PROPERTIES_TABLE(wxSpinButton)
-    wxEVENT_RANGE_PROPERTY( Spin , wxEVT_SCROLL_TOP , wxEVT_SCROLL_ENDSCROLL , wxSpinEvent )
+    wxEVENT_RANGE_PROPERTY( Spin , wxEVT_SCROLL_TOP , wxEVT_SCROLL_CHANGED , wxSpinEvent )
 
     wxPROPERTY( Value , int , SetValue, GetValue, 0 , 0 /*flags*/ , wxT("Helpstring") , wxT("group"))
     wxPROPERTY( Min , int , SetMin, GetMin, 0 , 0 /*flags*/ , wxT("Helpstring") , wxT("group"))
@@ -195,7 +195,7 @@ bool wxSpinButton::Create(wxWindow *parent,
 
     SubclassWin(m_hWnd);
 
-    SetBestSize(size);
+    SetInitialSize(size);
 
     return true;
 }
@@ -256,8 +256,15 @@ void wxSpinButton::SetValue(int val)
     }
 }
 
+void wxSpinButton::NormalizeValue()
+{
+    SetValue( GetValue() );
+}
+
 void wxSpinButton::SetRange(int minVal, int maxVal)
 {
+    const bool hadRange = m_min < m_max;
+
     wxSpinButtonBase::SetRange(minVal, maxVal);
 
 #ifdef UDM_SETRANGE32
@@ -272,6 +279,18 @@ void wxSpinButton::SetRange(int minVal, int maxVal)
         ::SendMessage(GetHwnd(), UDM_SETRANGE, 0,
                       (LPARAM) MAKELONG((short)maxVal, (short)minVal));
     }
+
+    // the current value might be out of the new range, force it to be in it
+    NormalizeValue();
+
+    // if range was valid but becomes degenerated (min == max) now or vice
+    // versa then the spin buttons are automatically disabled/enabled back
+    // but don't update themselves for some reason, so do it manually
+    if ( hadRange != (m_min < m_max) )
+    {
+        // update the visual state of the button
+        Refresh();
+    }
 }
 
 bool wxSpinButton::MSWOnScroll(int WXUNUSED(orientation), WXWORD wParam,
@@ -289,7 +308,7 @@ bool wxSpinButton::MSWOnScroll(int WXUNUSED(orientation), WXWORD wParam,
     event.SetPosition((short)pos);    // cast is important for negative values!
     event.SetEventObject(this);
 
-    return GetEventHandler()->ProcessEvent(event);
+    return HandleWindowEvent(event);
 }
 
 bool wxSpinButton::MSWOnNotify(int WXUNUSED(idCtrl), WXLPARAM lParam, WXLPARAM *result)
@@ -305,7 +324,7 @@ bool wxSpinButton::MSWOnNotify(int WXUNUSED(idCtrl), WXLPARAM lParam, WXLPARAM *
     event.SetPosition(lpnmud->iPos + lpnmud->iDelta);
     event.SetEventObject(this);
 
-    bool processed = GetEventHandler()->ProcessEvent(event);
+    bool processed = HandleWindowEvent(event);
 
     *result = event.IsAllowed() ? 0 : 1;