X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/65fd5cb0124e62ab1fc41f93382a205d95b00e75..15c3723c6092669f91c9251382f4a1521deeceeb:/src/msw/spinbutt.cpp diff --git a/src/msw/spinbutt.cpp b/src/msw/spinbutt.cpp index b83b6f0493..662a102242 100644 --- a/src/msw/spinbutt.cpp +++ b/src/msw/spinbutt.cpp @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: spinbutt.cpp +// Name: msw/spinbutt.cpp // Purpose: wxSpinButton // Author: Julian Smart // Modified by: @@ -9,8 +9,17 @@ // Licence: wxWindows license ///////////////////////////////////////////////////////////////////////////// +// ============================================================================ +// declarations +// ============================================================================ + +// ---------------------------------------------------------------------------- +// headers +// ---------------------------------------------------------------------------- + #ifdef __GNUG__ #pragma implementation "spinbutt.h" + #pragma implementation "spinbutbase.h" #endif // For compilers that support precompilation, includes "wx.h". @@ -21,25 +30,38 @@ #endif #ifndef WX_PRECOMP - #include "wx/wx.h" +#include "wx/app.h" #endif +#if wxUSE_SPINBTN + +#include "wx/spinbutt.h" + +IMPLEMENT_DYNAMIC_CLASS(wxSpinEvent, wxNotifyEvent) + // 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" -#if !defined(__GNUWIN32__) || defined(__TWIN32__) || defined(wxUSE_NORLANDER_HEADERS) +#if defined(__WIN95__) && !((defined(__GNUWIN32_OLD__) || defined(__TWIN32__)) && !defined(__CYGWIN10__)) #include #endif -#if !USE_SHARED_LIBRARY - IMPLEMENT_DYNAMIC_CLASS(wxSpinButton, wxControl) - IMPLEMENT_DYNAMIC_CLASS(wxSpinEvent, wxScrollEvent); -#endif +// ============================================================================ +// implementation +// ============================================================================ + +// ---------------------------------------------------------------------------- +// wxWin macros +// ---------------------------------------------------------------------------- + +IMPLEMENT_DYNAMIC_CLASS(wxSpinButton, wxControl) + +// ---------------------------------------------------------------------------- +// wxSpinButton +// ---------------------------------------------------------------------------- bool wxSpinButton::Create(wxWindow *parent, wxWindowID id, @@ -48,92 +70,165 @@ bool wxSpinButton::Create(wxWindow *parent, long style, const wxString& name) { - wxSystemSettings settings; - m_backgroundColour = parent->GetBackgroundColour() ; - m_foregroundColour = parent->GetForegroundColour() ; - - SetName(name); + // basic initialization + InitBase(); - int x = pos.x; - int y = pos.y; - int width = size.x; - int height = size.y; + m_windowId = (id == -1) ? NewControlId() : id; - m_windowStyle = style; + m_backgroundColour = parent->GetBackgroundColour() ; + m_foregroundColour = parent->GetForegroundColour() ; - SetParent(parent); + SetName(name); - if (width <= 0) - width = 100; - if (height <= 0) - height = 30; - if (x < 0) - x = 0; - if (y < 0) - y = 0; + int x = pos.x; + int y = pos.y; + int width = size.x; + int height = size.y; - InitBase(); + m_windowStyle = style; - m_windowId = (id == -1) ? NewControlId() : id; + SetParent(parent); - DWORD wstyle = WS_VISIBLE | WS_CHILD | WS_TABSTOP; - - if ( m_windowStyle & wxSP_HORIZONTAL ) - wstyle |= UDS_HORZ; - if ( m_windowStyle & wxSP_ARROW_KEYS ) - wstyle |= UDS_ARROWKEYS; - if ( m_windowStyle & wxSP_WRAP ) - wstyle |= UDS_WRAP; + // get the right size for the control + if ( width <= 0 || height <= 0 ) + { + wxSize size = DoGetBestSize(); + if ( width <= 0 ) + width = size.x; + if ( height <= 0 ) + height = size.y; + } - // Create the ListView control. - HWND hWndListControl = CreateUpDownControl(wstyle, - x, y, width, height, - (HWND) parent->GetHWND(), - m_windowId, - wxGetInstance(), - 0, - m_min, m_max, m_min); + if ( x < 0 ) + x = 0; + if ( y < 0 ) + y = 0; + + // translate the styles + 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 ) + wstyle |= UDS_ARROWKEYS; + if ( m_windowStyle & wxSP_WRAP ) + wstyle |= UDS_WRAP; + + // create the UpDown control. + m_hWnd = (WXHWND)CreateUpDownControl + ( + wstyle, + x, y, width, height, + GetHwndOf(parent), + m_windowId, + wxGetInstance(), + NULL, // no buddy + m_max, m_min, + m_min // initial position + ); + + if ( !m_hWnd ) + { + wxLogLastError(wxT("CreateUpDownControl")); - m_hWnd = (WXHWND) hWndListControl; - if (parent) parent->AddChild(this); + return FALSE; + } - // TODO: have this for all controls. - if ( !m_hWnd ) - return FALSE; + if ( parent ) + { + parent->AddChild(this); + } - SubclassWin((WXHWND) m_hWnd); + SubclassWin(m_hWnd); - return TRUE; + return TRUE; } wxSpinButton::~wxSpinButton() { } +// ---------------------------------------------------------------------------- +// size calculation +// ---------------------------------------------------------------------------- + +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)); + } +} + +// ---------------------------------------------------------------------------- // Attributes -//////////////////////////////////////////////////////////////////////////// +// ---------------------------------------------------------------------------- int wxSpinButton::GetValue() const { +#ifdef UDM_GETPOS32 + if ( wxTheApp->GetComCtl32Version() >= 580 ) + { + // use the full 32 bit range if available + return ::SendMessage(GetHwnd(), UDM_GETPOS32, 0, 0); + } +#endif // UDM_GETPOS32 + + // we're limited to 16 bit return (short)LOWORD(::SendMessage(GetHwnd(), UDM_GETPOS, 0, 0)); } 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 ( wxTheApp->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::SetRange(int minVal, int maxVal) { wxSpinButtonBase::SetRange(minVal, maxVal); - ::SendMessage(GetHwnd(), UDM_SETRANGE, 0, - (LPARAM) MAKELONG((short)maxVal, (short)minVal)); + +#ifdef UDM_SETRANGE32 + if ( wxTheApp->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)); + } } -bool wxSpinButton::MSWOnScroll(int orientation, WXWORD wParam, +bool wxSpinButton::MSWOnScroll(int WXUNUSED(orientation), WXWORD wParam, WXWORD pos, WXHWND control) { - wxCHECK_MSG( control, FALSE, _T("scrolling what?") ) + wxCHECK_MSG( control, FALSE, wxT("scrolling what?") ) if ( wParam != SB_THUMBPOSITION ) { @@ -148,10 +243,12 @@ bool wxSpinButton::MSWOnScroll(int orientation, WXWORD wParam, return GetEventHandler()->ProcessEvent(event); } -bool wxSpinButton::MSWOnNotify(int idCtrl, WXLPARAM lParam, WXLPARAM *result) +bool wxSpinButton::MSWOnNotify(int WXUNUSED(idCtrl), WXLPARAM lParam, WXLPARAM *result) { -#ifndef __GNUWIN32__ - LPNMUPDOWN lpnmud = (LPNMUPDOWN)lParam; + 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, @@ -164,15 +261,16 @@ bool wxSpinButton::MSWOnNotify(int idCtrl, WXLPARAM lParam, WXLPARAM *result) *result = event.IsAllowed() ? 0 : 1; return processed; -#else - return FALSE; -#endif } -bool wxSpinButton::MSWCommand(WXUINT cmd, WXWORD id) +bool wxSpinButton::MSWCommand(WXUINT WXUNUSED(cmd), WXWORD WXUNUSED(id)) { // No command messages return FALSE; } #endif // __WIN95__ + +#endif + // wxUSE_SPINCTN +