X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/727953356df2db52b0292589782175fd6de37e03..69659fd770f615210efac4b4fa741b3ad6223616:/src/msw/spinbutt.cpp?ds=sidebyside diff --git a/src/msw/spinbutt.cpp b/src/msw/spinbutt.cpp index ee90758b65..4b3f25570c 100644 --- a/src/msw/spinbutt.cpp +++ b/src/msw/spinbutt.cpp @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: msw/spinbutt.cpp +// Name: src/msw/spinbutt.cpp // Purpose: wxSpinButton // Author: Julian Smart // Modified by: @@ -17,11 +17,6 @@ // 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" @@ -30,7 +25,8 @@ #endif #ifndef WX_PRECOMP -#include "wx/app.h" + #include "wx/msw/wrapcctl.h" // include "properly" + #include "wx/app.h" #endif #if wxUSE_SPINBTN @@ -39,12 +35,15 @@ IMPLEMENT_DYNAMIC_CLASS(wxSpinEvent, wxNotifyEvent) -#if defined(__WIN95__) - #include "wx/msw/private.h" -#if defined(__WIN95__) && !(defined(__GNUWIN32_OLD__) && !defined(__CYGWIN10__)) - #include +#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 // ============================================================================ @@ -68,7 +67,7 @@ wxBEGIN_FLAGS( wxSpinButtonStyle ) wxFLAGS_MEMBER(wxBORDER_RAISED) wxFLAGS_MEMBER(wxBORDER_STATIC) wxFLAGS_MEMBER(wxBORDER_NONE) - + // old style border flags wxFLAGS_MEMBER(wxSIMPLE_BORDER) wxFLAGS_MEMBER(wxSUNKEN_BORDER) @@ -97,18 +96,18 @@ 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")) - wxPROPERTY( Max , int , SetMax, GetMax, 0 , 0 /*flags*/ , wxT("Helpstring") , wxT("group")) - wxPROPERTY_FLAGS( WindowStyle , wxSpinButtonStyle , long , SetWindowStyleFlag , GetWindowStyleFlag , , 0 /*flags*/ , wxT("Helpstring") , wxT("group")) // style + 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 ) +wxCONSTRUCTOR_5( wxSpinButton , wxWindow* , Parent , wxWindowID , Id , wxPoint , Position , wxSize , Size , long , WindowStyle ) #else IMPLEMENT_DYNAMIC_CLASS(wxSpinButton, wxControl) #endif @@ -127,10 +126,7 @@ bool wxSpinButton::Create(wxWindow *parent, const wxString& name) { // basic initialization - m_windowId = (id == -1) ? NewControlId() : id; - - m_backgroundColour = parent->GetBackgroundColour() ; - m_foregroundColour = parent->GetForegroundColour() ; + m_windowId = (id == wxID_ANY) ? NewControlId() : id; SetName(name); @@ -189,7 +185,7 @@ bool wxSpinButton::Create(wxWindow *parent, { wxLogLastError(wxT("CreateUpDownControl")); - return FALSE; + return false; } if ( parent ) @@ -199,7 +195,9 @@ bool wxSpinButton::Create(wxWindow *parent, SubclassWin(m_hWnd); - return TRUE; + SetInitialSize(size); + + return true; } wxSpinButton::~wxSpinButton() @@ -212,18 +210,7 @@ wxSpinButton::~wxSpinButton() wxSize wxSpinButton::DoGetBestSize() const { - if ( (GetWindowStyle() & wxSP_VERTICAL) != 0 ) - { - // vertical control - return wxSize(GetSystemMetrics(SM_CXVSCROLL), - 2*GetSystemMetrics(SM_CYVSCROLL)); - } - else - { - // horizontal control - return wxSize(2*GetSystemMetrics(SM_CXHSCROLL), - GetSystemMetrics(SM_CYHSCROLL)); - } + return GetBestSpinnerSize( (GetWindowStyle() & wxSP_VERTICAL) != 0 ); } // ---------------------------------------------------------------------------- @@ -232,16 +219,24 @@ wxSize wxSpinButton::DoGetBestSize() const int wxSpinButton::GetValue() const { + int n; #ifdef UDM_GETPOS32 - if ( wxTheApp->GetComCtl32Version() >= 580 ) + if ( wxApp::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)); + } - // we're limited to 16 bit - return (short)LOWORD(::SendMessage(GetHwnd(), UDM_GETPOS, 0, 0)); + if (n < m_min) n = m_min; + if (n > m_max) n = m_max; + + return n; } void wxSpinButton::SetValue(int val) @@ -249,7 +244,7 @@ void wxSpinButton::SetValue(int val) // 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); @@ -261,12 +256,19 @@ 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 - if ( wxTheApp->GetComCtl32Version() >= 471 ) + if ( wxApp::GetComCtl32Version() >= 471 ) { // use the full 32 bit range if available ::SendMessage(GetHwnd(), UDM_SETRANGE32, minVal, maxVal); @@ -277,17 +279,29 @@ 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, WXWORD pos, WXHWND control) { - wxCHECK_MSG( control, FALSE, wxT("scrolling what?") ) + wxCHECK_MSG( control, false, wxT("scrolling what?") ); if ( wParam != SB_THUMBPOSITION ) { // probable SB_ENDSCROLL - we don't react to it - return FALSE; + return false; } wxSpinEvent event(wxEVT_SCROLL_THUMBTRACK, m_windowId); @@ -302,7 +316,7 @@ bool wxSpinButton::MSWOnNotify(int WXUNUSED(idCtrl), WXLPARAM lParam, WXLPARAM * NM_UPDOWN *lpnmud = (NM_UPDOWN *)lParam; if (lpnmud->hdr.hwndFrom != GetHwnd()) // make sure it is the right control - return FALSE; + return false; wxSpinEvent event(lpnmud->iDelta > 0 ? wxEVT_SCROLL_LINEUP : wxEVT_SCROLL_LINEDOWN, @@ -320,11 +334,7 @@ bool wxSpinButton::MSWOnNotify(int WXUNUSED(idCtrl), WXLPARAM lParam, WXLPARAM * bool wxSpinButton::MSWCommand(WXUINT WXUNUSED(cmd), WXWORD WXUNUSED(id)) { // No command messages - return FALSE; + return false; } -#endif // __WIN95__ - -#endif - // wxUSE_SPINCTN - +#endif // wxUSE_SPINBTN