/////////////////////////////////////////////////////////////////////////////
-// Name: msw/spinbutt.cpp
+// Name: src/msw/spinbutt.cpp
// Purpose: wxSpinButton
// Author: Julian Smart
// Modified by:
#endif
#ifndef WX_PRECOMP
-#include "wx/app.h"
+ #include "wx/app.h"
#endif
#if wxUSE_SPINBTN
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"))
{
int n;
#ifdef UDM_GETPOS32
- if ( wxTheApp->GetComCtl32Version() >= 580 )
+ if ( wxApp::GetComCtl32Version() >= 580 )
{
// use the full 32 bit range if available
n = ::SendMessage(GetHwnd(), UDM_GETPOS32, 0, 0);
// wxSpinButtonBase::SetValue(val); -- no, it is pure virtual
#ifdef UDM_SETPOS32
- if ( wxTheApp->GetComCtl32Version() >= 580 )
+ if ( wxApp::GetComCtl32Version() >= 580 )
{
// use the full 32 bit range if available
::SendMessage(GetHwnd(), UDM_SETPOS32, 0, val);
void wxSpinButton::SetRange(int minVal, int maxVal)
{
+ const bool hadRange = m_min < m_max;
+
wxSpinButtonBase::SetRange(minVal, maxVal);
#ifdef UDM_SETRANGE32
::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,
WXWORD pos, WXHWND control)
{
- wxCHECK_MSG( control, false, wxT("scrolling what?") )
+ wxCHECK_MSG( control, false, wxT("scrolling what?") );
if ( wParam != SB_THUMBPOSITION )
{