wxFLAGS_MEMBER(wxBORDER_RAISED)
wxFLAGS_MEMBER(wxBORDER_STATIC)
wxFLAGS_MEMBER(wxBORDER_NONE)
-
+
// old style border flags
wxFLAGS_MEMBER(wxSIMPLE_BORDER)
wxFLAGS_MEMBER(wxSUNKEN_BORDER)
wxBEGIN_HANDLERS_TABLE(wxSpinButton)
wxEND_HANDLERS_TABLE()
-wxCONSTRUCTOR_5( wxSpinButton , wxWindow* , Parent , wxWindowID , Id , wxPoint , Position , wxSize , Size , long , WindowStyle )
+wxCONSTRUCTOR_5( wxSpinButton , wxWindow* , Parent , wxWindowID , Id , wxPoint , Position , wxSize , Size , long , WindowStyle )
#else
IMPLEMENT_DYNAMIC_CLASS(wxSpinButton, wxControl)
#endif
int wxSpinButton::GetValue() const
{
+ int n;
#ifdef UDM_GETPOS32
if ( wxTheApp->GetComCtl32Version() >= 580 )
{
// use the full 32 bit range if available
- return ::SendMessage(GetHwnd(), UDM_GETPOS32, 0, 0);
+ n = ::SendMessage(GetHwnd(), UDM_GETPOS32, 0, 0);
}
+ else
#endif // UDM_GETPOS32
+ {
+ // we're limited to 16 bit
+ n = (short)LOWORD(::SendMessage(GetHwnd(), UDM_GETPOS, 0, 0));
+ }
+
+ if (n < m_min) n = m_min;
+ if (n > m_max) n = m_max;
- // we're limited to 16 bit
- return (short)LOWORD(::SendMessage(GetHwnd(), UDM_GETPOS, 0, 0));
+ return n;
}
void wxSpinButton::SetValue(int val)
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 )
{