X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/f6bcfd974ef26faf6f91a62cac09827e09463fd1..0fe5e8fea017ecb73f8aaa8ceb745feb269b3f79:/src/msw/spinbutt.cpp?ds=inline diff --git a/src/msw/spinbutt.cpp b/src/msw/spinbutt.cpp index 03428c16ee..215abe2427 100644 --- a/src/msw/spinbutt.cpp +++ b/src/msw/spinbutt.cpp @@ -46,7 +46,7 @@ IMPLEMENT_DYNAMIC_CLASS(wxSpinEvent, wxNotifyEvent) #include "wx/msw/private.h" -#if defined(__WIN95__) && !(defined(__GNUWIN32_OLD__) || defined(__TWIN32__)) +#if defined(__WIN95__) && !((defined(__GNUWIN32_OLD__) || defined(__TWIN32__)) && !defined(__CYGWIN10__)) #include #endif @@ -110,6 +110,8 @@ bool wxSpinButton::Create(wxWindow *parent, 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 ) @@ -192,7 +194,7 @@ void wxSpinButton::SetRange(int minVal, int maxVal) (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, wxT("scrolling what?") ) @@ -210,7 +212,7 @@ 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__ #if defined(__BORLANDC__) || defined(__WATCOMC__) @@ -240,7 +242,7 @@ bool wxSpinButton::MSWOnNotify(int idCtrl, WXLPARAM lParam, WXLPARAM *result) #endif } -bool wxSpinButton::MSWCommand(WXUINT cmd, WXWORD id) +bool wxSpinButton::MSWCommand(WXUINT WXUNUSED(cmd), WXWORD WXUNUSED(id)) { // No command messages return FALSE;