X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/7798a18ec81d3733082bc60a958fac1d4510faca..bcc46c75590b4127bbfd5b164b9c3f8f44980a84:/src/msw/spinbutt.cpp diff --git a/src/msw/spinbutt.cpp b/src/msw/spinbutt.cpp index db8c8dc34b..e3c8964586 100644 --- a/src/msw/spinbutt.cpp +++ b/src/msw/spinbutt.cpp @@ -6,49 +6,51 @@ // Created: 04/01/98 // RCS-ID: $Id$ // Copyright: (c) Julian Smart and Markus Holzem -// Licence: wxWindows license +// Licence: wxWindows license ///////////////////////////////////////////////////////////////////////////// #ifdef __GNUG__ -#pragma implementation "spinbutt.h" + #pragma implementation "spinbutt.h" #endif // For compilers that support precompilation, includes "wx.h". #include "wx/wxprec.h" #ifdef __BORLANDC__ -#pragma hdrstop + #pragma hdrstop #endif #ifndef WX_PRECOMP -#include "wx.h" + #include "wx/wx.h" #endif -#if defined(__WIN95__) +// Can't resolve reference to CreateUpDownControl in +// TWIN32, but could probably use normal CreateWindow instead. + +#if defined(__WIN95__) && !defined(__TWIN32__) #include "wx/spinbutt.h" #include "wx/msw/private.h" -#ifndef __GNUWIN32__ -#include +#if !defined(__GNUWIN32__) || defined(__TWIN32__) || defined(wxUSE_NORLANDER_HEADERS) + #include #endif #if !USE_SHARED_LIBRARY -IMPLEMENT_DYNAMIC_CLASS(wxSpinButton, wxControl) + IMPLEMENT_DYNAMIC_CLASS(wxSpinButton, wxControl) + IMPLEMENT_DYNAMIC_CLASS(wxSpinEvent, wxScrollEvent); #endif -wxSpinButton::wxSpinButton(void) -{ - m_min = 0; - m_max = 100; -} - -bool wxSpinButton::Create(wxWindow *parent, const wxWindowID id, const wxPoint& pos, const wxSize& size, - const long style, const wxString& name) +bool wxSpinButton::Create(wxWindow *parent, + wxWindowID id, + const wxPoint& pos, + const wxSize& size, + long style, + const wxString& name) { wxSystemSettings settings; - m_backgroundColour = parent->GetDefaultBackgroundColour() ; - m_foregroundColour = parent->GetDefaultForegroundColour() ; + m_backgroundColour = parent->GetBackgroundColour() ; + m_foregroundColour = parent->GetForegroundColour() ; SetName(name); @@ -70,19 +72,18 @@ bool wxSpinButton::Create(wxWindow *parent, const wxWindowID id, const wxPoint& if (y < 0) y = 0; - m_min = 0; - m_max = 100; + InitBase(); m_windowId = (id == -1) ? NewControlId() : id; DWORD wstyle = WS_VISIBLE | WS_CHILD | WS_TABSTOP; - + if ( m_windowStyle & wxSP_HORIZONTAL ) - wstyle |= UDS_HORZ; + wstyle |= UDS_HORZ; if ( m_windowStyle & wxSP_ARROW_KEYS ) - wstyle |= UDS_ARROWKEYS; + wstyle |= UDS_ARROWKEYS; if ( m_windowStyle & wxSP_WRAP ) - wstyle |= UDS_WRAP; + wstyle |= UDS_WRAP; // Create the ListView control. HWND hWndListControl = CreateUpDownControl(wstyle, @@ -91,179 +92,91 @@ bool wxSpinButton::Create(wxWindow *parent, const wxWindowID id, const wxPoint& m_windowId, wxGetInstance(), 0, - m_min, m_max, 0); + m_min, m_max, m_min); m_hWnd = (WXHWND) hWndListControl; if (parent) parent->AddChild(this); // TODO: have this for all controls. if ( !m_hWnd ) - return FALSE; - + return FALSE; + SubclassWin((WXHWND) m_hWnd); return TRUE; } -wxSpinButton::~wxSpinButton(void) +wxSpinButton::~wxSpinButton() { } // Attributes //////////////////////////////////////////////////////////////////////////// -int wxSpinButton::GetValue(void) const +int wxSpinButton::GetValue() const { - return (int) ::SendMessage((HWND) GetHWND(), UDM_GETPOS, 0, 0); + return (short)LOWORD(::SendMessage(GetHwnd(), UDM_GETPOS, 0, 0)); } -void wxSpinButton::SetValue(const int val) +void wxSpinButton::SetValue(int val) { - ::SendMessage((HWND) GetHWND(), UDM_SETPOS, 0, (LPARAM) MAKELONG((short) val, 0)); + ::SendMessage(GetHwnd(), UDM_SETPOS, 0, (LPARAM) MAKELONG((short) val, 0)); } -void wxSpinButton::SetRange(const int minVal, const int maxVal) +void wxSpinButton::SetRange(int minVal, int maxVal) { - m_min = minVal; - m_max = maxVal; - ::SendMessage((HWND) GetHWND(), UDM_SETRANGE, 0, (LPARAM) MAKELONG((short) minVal, (short) maxVal)); + wxSpinButtonBase::SetRange(minVal, maxVal); + ::SendMessage(GetHwnd(), UDM_SETRANGE, 0, + (LPARAM) MAKELONG((short)maxVal, (short)minVal)); } -void wxSpinButton::MSWOnVScroll(const WXWORD wParam, const WXWORD pos, const WXHWND control) +bool wxSpinButton::MSWOnScroll(int orientation, WXWORD wParam, + WXWORD pos, WXHWND control) { - if (control) - { - wxSpinEvent event(wxEVT_NULL, m_windowId); - event.SetPosition(pos); - event.SetOrientation(wxVERTICAL); - event.SetEventObject( this ); - - switch ( wParam ) - { - case SB_TOP: - event.m_eventType = wxEVT_SCROLL_TOP; - break; - - case SB_BOTTOM: - event.m_eventType = wxEVT_SCROLL_BOTTOM; - break; - - case SB_LINEUP: - event.m_eventType = wxEVT_SCROLL_LINEUP; - break; - - case SB_LINEDOWN: - event.m_eventType = wxEVT_SCROLL_LINEDOWN; - break; - - case SB_PAGEUP: - event.m_eventType = wxEVT_SCROLL_PAGEUP; - break; - - case SB_PAGEDOWN: - event.m_eventType = wxEVT_SCROLL_PAGEDOWN; - break; - - case SB_THUMBTRACK: - case SB_THUMBPOSITION: - event.m_eventType = wxEVT_SCROLL_THUMBTRACK; - break; - - default: - return; - break; - } - if (!GetEventHandler()->ProcessEvent(event)) - Default(); - } -} + wxCHECK_MSG( control, FALSE, _T("scrolling what?") ) -void wxSpinButton::MSWOnHScroll( const WXWORD wParam, const WXWORD pos, const WXHWND control) -{ - if (control) - { - wxSpinEvent event(wxEVT_NULL, m_windowId); - event.SetPosition(pos); - event.SetOrientation(wxHORIZONTAL); - event.SetEventObject( this ); - - switch ( wParam ) - { - case SB_TOP: - event.m_eventType = wxEVT_SCROLL_TOP; - break; - - case SB_BOTTOM: - event.m_eventType = wxEVT_SCROLL_BOTTOM; - break; - - case SB_LINEUP: - event.m_eventType = wxEVT_SCROLL_LINEUP; - break; - - case SB_LINEDOWN: - event.m_eventType = wxEVT_SCROLL_LINEDOWN; - break; - - case SB_PAGEUP: - event.m_eventType = wxEVT_SCROLL_PAGEUP; - break; - - case SB_PAGEDOWN: - event.m_eventType = wxEVT_SCROLL_PAGEDOWN; - break; - - case SB_THUMBTRACK: - case SB_THUMBPOSITION: - event.m_eventType = wxEVT_SCROLL_THUMBTRACK; - break; - - default: - return; - break; - } - if (!GetEventHandler()->ProcessEvent(event)) - Default(); - } -} + if ( wParam != SB_THUMBPOSITION ) + { + // probable SB_ENDSCROLL - we don't react to it + return FALSE; + } -bool wxSpinButton::MSWCommand(const WXUINT cmd, const WXWORD id) -{ - // No command messages - 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); } -bool wxSpinButton::MSWNotify(const WXWPARAM wParam, const WXLPARAM lParam) +bool wxSpinButton::MSWOnNotify(int idCtrl, WXLPARAM lParam, WXLPARAM *result) { - NMHDR* hdr1 = (NMHDR*) lParam; - switch ( hdr1->code ) - { -/* We don't process this message, currently */ - case UDN_DELTAPOS: - { - return wxControl::MSWNotify(wParam, lParam); - break; - } - default : - return wxControl::MSWNotify(wParam, lParam); - break; - } -/* - event.eventObject = this; - event.SetEventType(eventType); - - if ( !ProcessEvent(event) ) - return FALSE; -*/ - return TRUE; -} +#ifndef __GNUWIN32__ +#ifdef __BORLANDC__ + LPNM_UPDOWN lpnmud = (LPNM_UPDOWN)lParam; +#else + LPNMUPDOWN lpnmud = (LPNMUPDOWN)lParam; +#endif + + wxSpinEvent event(lpnmud->iDelta > 0 ? wxEVT_SCROLL_LINEUP + : wxEVT_SCROLL_LINEDOWN, + m_windowId); + event.SetPosition(lpnmud->iPos + lpnmud->iDelta); + event.SetEventObject(this); -// Spin event -IMPLEMENT_DYNAMIC_CLASS(wxSpinEvent, wxScrollEvent) + bool processed = GetEventHandler()->ProcessEvent(event); -wxSpinEvent::wxSpinEvent(wxEventType commandType, int id): - wxScrollEvent(commandType, id) + *result = event.IsAllowed() ? 0 : 1; + + return processed; +#else + return FALSE; +#endif +} + +bool wxSpinButton::MSWCommand(WXUINT cmd, WXWORD id) { + // No command messages + return FALSE; } -#endif +#endif // __WIN95__