/////////////////////////////////////////////////////////////////////////////
-// Name: msw/spinbutt.cpp
+// Name: src/msw/spinbutt.cpp
// Purpose: wxSpinButton
// Author: Julian Smart
// Modified by:
// headers
// ----------------------------------------------------------------------------
-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
- #pragma implementation "spinbutt.h"
- #pragma implementation "spinbutbase.h"
-#endif
-
// For compilers that support precompilation, includes "wx.h".
#include "wx/wxprec.h"
#endif
#ifndef WX_PRECOMP
-#include "wx/app.h"
+ #include "wx/msw/wrapcctl.h" // include <commctrl.h> "properly"
+ #include "wx/app.h"
#endif
#if wxUSE_SPINBTN
#include "wx/spinbutt.h"
-IMPLEMENT_DYNAMIC_CLASS(wxSpinEvent, wxNotifyEvent)
-
#include "wx/msw/private.h"
-#include "wx/msw/wrapcctl.h"
+
+#ifndef UDM_SETRANGE32
+ #define UDM_SETRANGE32 (WM_USER+111)
+#endif
+
+#ifndef UDM_SETPOS32
+ #define UDM_SETPOS32 (WM_USER+113)
+ #define UDM_GETPOS32 (WM_USER+114)
+#endif
// ============================================================================
// implementation
// wxWin macros
// ----------------------------------------------------------------------------
-
-#if wxUSE_EXTENDED_RTTI
-WX_DEFINE_FLAGS( wxSpinButtonStyle )
-
-wxBEGIN_FLAGS( wxSpinButtonStyle )
- // new style border flags, we put them first to
- // use them for streaming out
- wxFLAGS_MEMBER(wxBORDER_SIMPLE)
- wxFLAGS_MEMBER(wxBORDER_SUNKEN)
- wxFLAGS_MEMBER(wxBORDER_DOUBLE)
- wxFLAGS_MEMBER(wxBORDER_RAISED)
- wxFLAGS_MEMBER(wxBORDER_STATIC)
- wxFLAGS_MEMBER(wxBORDER_NONE)
-
- // old style border flags
- wxFLAGS_MEMBER(wxSIMPLE_BORDER)
- wxFLAGS_MEMBER(wxSUNKEN_BORDER)
- wxFLAGS_MEMBER(wxDOUBLE_BORDER)
- wxFLAGS_MEMBER(wxRAISED_BORDER)
- wxFLAGS_MEMBER(wxSTATIC_BORDER)
- wxFLAGS_MEMBER(wxBORDER)
-
- // standard window styles
- wxFLAGS_MEMBER(wxTAB_TRAVERSAL)
- wxFLAGS_MEMBER(wxCLIP_CHILDREN)
- wxFLAGS_MEMBER(wxTRANSPARENT_WINDOW)
- wxFLAGS_MEMBER(wxWANTS_CHARS)
- wxFLAGS_MEMBER(wxFULL_REPAINT_ON_RESIZE)
- wxFLAGS_MEMBER(wxALWAYS_SHOW_SB )
- wxFLAGS_MEMBER(wxVSCROLL)
- wxFLAGS_MEMBER(wxHSCROLL)
-
- wxFLAGS_MEMBER(wxSP_HORIZONTAL)
- wxFLAGS_MEMBER(wxSP_VERTICAL)
- wxFLAGS_MEMBER(wxSP_ARROW_KEYS)
- wxFLAGS_MEMBER(wxSP_WRAP)
-
-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 )
-
- wxPROPERTY( Value , int , SetValue, GetValue, 0 , 0 /*flags*/ , wxT("Helpstring") , wxT("group"))
- wxPROPERTY( Min , int , SetMin, GetMin, 0 , 0 /*flags*/ , wxT("Helpstring") , wxT("group"))
- wxPROPERTY( Max , int , SetMax, GetMax, 0 , 0 /*flags*/ , wxT("Helpstring") , wxT("group"))
- wxPROPERTY_FLAGS( WindowStyle , wxSpinButtonStyle , long , SetWindowStyleFlag , GetWindowStyleFlag , EMPTY_MACROVALUE , 0 /*flags*/ , wxT("Helpstring") , wxT("group")) // style
-wxEND_PROPERTIES_TABLE()
-
-wxBEGIN_HANDLERS_TABLE(wxSpinButton)
-wxEND_HANDLERS_TABLE()
-
-wxCONSTRUCTOR_5( wxSpinButton , wxWindow* , Parent , wxWindowID , Id , wxPoint , Position , wxSize , Size , long , WindowStyle )
-#else
-IMPLEMENT_DYNAMIC_CLASS(wxSpinButton, wxControl)
-#endif
-
-
-
// ----------------------------------------------------------------------------
// wxSpinButton
// ----------------------------------------------------------------------------
SubclassWin(m_hWnd);
- SetBestSize(size);
+ SetInitialSize(size);
return true;
}
{
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::NormalizeValue()
+{
+ SetValue( GetValue() );
+}
+
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)
+ WXWORD WXUNUSED(pos), WXHWND control)
{
- wxCHECK_MSG( control, false, wxT("scrolling what?") )
+ wxCHECK_MSG( control, false, wxT("scrolling what?") );
if ( wParam != SB_THUMBPOSITION )
{
}
wxSpinEvent event(wxEVT_SCROLL_THUMBTRACK, m_windowId);
- event.SetPosition((short)pos); // cast is important for negative values!
+ // We can't use 16 bit position provided in this message for spin buttons
+ // using 32 bit range.
+ event.SetPosition(GetValue());
event.SetEventObject(this);
- return GetEventHandler()->ProcessEvent(event);
+ return HandleWindowEvent(event);
}
bool wxSpinButton::MSWOnNotify(int WXUNUSED(idCtrl), WXLPARAM lParam, WXLPARAM *result)
event.SetPosition(lpnmud->iPos + lpnmud->iDelta);
event.SetEventObject(this);
- bool processed = GetEventHandler()->ProcessEvent(event);
+ bool processed = HandleWindowEvent(event);
*result = event.IsAllowed() ? 0 : 1;
projects / wxWidgets.git / blobdiff