X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/2fa7c206f68655f226e37ce1f1cc7e646e6c0bf2..655e246b86923bf721f1725191140451a189ca0c:/src/msw/spinbutt.cpp diff --git a/src/msw/spinbutt.cpp b/src/msw/spinbutt.cpp index 826c4a5e1b..6d6f93e5b5 100644 --- a/src/msw/spinbutt.cpp +++ b/src/msw/spinbutt.cpp @@ -1,12 +1,12 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: spinbutt.cpp +// Name: src/msw/spinbutt.cpp // Purpose: wxSpinButton // Author: Julian Smart // Modified by: // Created: 04/01/98 // RCS-ID: $Id$ -// Copyright: (c) Julian Smart and Markus Holzem -// Licence: wxWindows license +// Copyright: (c) Julian Smart +// Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// // ============================================================================ @@ -17,11 +17,6 @@ // headers // ---------------------------------------------------------------------------- -#ifdef __GNUG__ - #pragma implementation "spinbutt.h" - #pragma implementation "spinbutbase.h" -#endif - // For compilers that support precompilation, includes "wx.h". #include "wx/wxprec.h" @@ -30,23 +25,23 @@ #endif #ifndef WX_PRECOMP - #include "wx/wx.h" + #include "wx/msw/wrapcctl.h" // include "properly" + #include "wx/app.h" #endif -// Can't resolve reference to CreateUpDownControl in -// TWIN32, but could probably use normal CreateWindow instead. - #if wxUSE_SPINBTN -IMPLEMENT_DYNAMIC_CLASS(wxSpinEvent, wxNotifyEvent) - -#if defined(__WIN95__) && !defined(__TWIN32__) - #include "wx/spinbutt.h" + #include "wx/msw/private.h" -#if defined(__WIN95__) && !(defined(__GNUWIN32_OLD__) || defined(__TWIN32__)) - #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 // ============================================================================ @@ -57,8 +52,6 @@ IMPLEMENT_DYNAMIC_CLASS(wxSpinEvent, wxNotifyEvent) // wxWin macros // ---------------------------------------------------------------------------- -IMPLEMENT_DYNAMIC_CLASS(wxSpinButton, wxControl) - // ---------------------------------------------------------------------------- // wxSpinButton // ---------------------------------------------------------------------------- @@ -71,12 +64,7 @@ bool wxSpinButton::Create(wxWindow *parent, const wxString& name) { // basic initialization - InitBase(); - - m_windowId = (id == -1) ? NewControlId() : id; - - m_backgroundColour = parent->GetBackgroundColour() ; - m_foregroundColour = parent->GetForegroundColour() ; + m_windowId = (id == wxID_ANY) ? NewControlId() : id; SetName(name); @@ -105,10 +93,12 @@ bool wxSpinButton::Create(wxWindow *parent, y = 0; // translate the styles - DWORD wstyle = WS_VISIBLE | WS_CHILD | WS_TABSTOP | + DWORD wstyle = WS_VISIBLE | WS_CHILD | WS_TABSTOP | /* WS_CLIPSIBLINGS | */ UDS_NOTHOUSANDS | // never useful, sometimes harmful UDS_SETBUDDYINT; // it doesn't harm if we don't have buddy + if ( m_windowStyle & wxCLIP_SIBLINGS ) + wstyle |= WS_CLIPSIBLINGS; if ( m_windowStyle & wxSP_HORIZONTAL ) wstyle |= UDS_HORZ; if ( m_windowStyle & wxSP_ARROW_KEYS ) @@ -131,9 +121,9 @@ bool wxSpinButton::Create(wxWindow *parent, if ( !m_hWnd ) { - wxLogLastError("CreateUpDownControl"); + wxLogLastError(wxT("CreateUpDownControl")); - return FALSE; + return false; } if ( parent ) @@ -143,7 +133,9 @@ bool wxSpinButton::Create(wxWindow *parent, SubclassWin(m_hWnd); - return TRUE; + SetInitialSize(size); + + return true; } wxSpinButton::~wxSpinButton() @@ -156,18 +148,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 ); } // ---------------------------------------------------------------------------- @@ -176,49 +157,104 @@ wxSize wxSpinButton::DoGetBestSize() const int wxSpinButton::GetValue() const { - return (short)LOWORD(::SendMessage(GetHwnd(), UDM_GETPOS, 0, 0)); + int n; +#ifdef UDM_GETPOS32 + if ( wxApp::GetComCtl32Version() >= 580 ) + { + // use the full 32 bit range if available + 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; + + return n; } void wxSpinButton::SetValue(int val) { - ::SendMessage(GetHwnd(), UDM_SETPOS, 0, (LPARAM) MAKELONG((short) val, 0)); + // wxSpinButtonBase::SetValue(val); -- no, it is pure virtual + +#ifdef UDM_SETPOS32 + if ( wxApp::GetComCtl32Version() >= 580 ) + { + // use the full 32 bit range if available + ::SendMessage(GetHwnd(), UDM_SETPOS32, 0, val); + } + else // we're limited to 16 bit +#endif // UDM_SETPOS32 + { + ::SendMessage(GetHwnd(), UDM_SETPOS, 0, MAKELONG((short) val, 0)); + } +} + +void wxSpinButton::NormalizeValue() +{ + SetValue( GetValue() ); } void wxSpinButton::SetRange(int minVal, int maxVal) { + const bool hadRange = m_min < m_max; + wxSpinButtonBase::SetRange(minVal, maxVal); - ::SendMessage(GetHwnd(), UDM_SETRANGE, 0, - (LPARAM) MAKELONG((short)maxVal, (short)minVal)); + +#ifdef UDM_SETRANGE32 + if ( wxApp::GetComCtl32Version() >= 471 ) + { + // use the full 32 bit range if available + ::SendMessage(GetHwnd(), UDM_SETRANGE32, minVal, maxVal); + } + else // we're limited to 16 bit +#endif // 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 orientation, WXWORD wParam, +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); event.SetPosition((short)pos); // cast is important for negative values! event.SetEventObject(this); - return GetEventHandler()->ProcessEvent(event); + return HandleWindowEvent(event); } -bool wxSpinButton::MSWOnNotify(int idCtrl, WXLPARAM lParam, WXLPARAM *result) +bool wxSpinButton::MSWOnNotify(int WXUNUSED(idCtrl), WXLPARAM lParam, WXLPARAM *result) { -#ifndef __GNUWIN32__ -#if defined(__BORLANDC__) || defined(__WATCOMC__) - LPNM_UPDOWN lpnmud = (LPNM_UPDOWN)lParam; -#elif defined(__VISUALC__) && (__VISUALC__ >= 1000) && (__VISUALC__ < 1020) - LPNM_UPDOWN lpnmud = (LPNM_UPDOWN)lParam; -#else - LPNMUPDOWN lpnmud = (LPNMUPDOWN)lParam; -#endif + NM_UPDOWN *lpnmud = (NM_UPDOWN *)lParam; + + if (lpnmud->hdr.hwndFrom != GetHwnd()) // make sure it is the right control + return false; wxSpinEvent event(lpnmud->iDelta > 0 ? wxEVT_SCROLL_LINEUP : wxEVT_SCROLL_LINEDOWN, @@ -226,24 +262,17 @@ bool wxSpinButton::MSWOnNotify(int 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; return processed; -#else // GnuWin32 - return FALSE; -#endif } -bool wxSpinButton::MSWCommand(WXUINT cmd, WXWORD id) +bool wxSpinButton::MSWCommand(WXUINT WXUNUSED(cmd), WXWORD WXUNUSED(id)) { // No command messages - return FALSE; + return false; } -#endif // __WIN95__ - -#endif - // wxUSE_SPINCTN - +#endif // wxUSE_SPINBTN