X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/882a8f40e259edccf7ab628d8bddf08220fb3e2c..8b3fddc49326c0b6019cd7082218726aa17a5727:/src/msw/spinbutt.cpp?ds=inline diff --git a/src/msw/spinbutt.cpp b/src/msw/spinbutt.cpp index cbd779d665..215abe2427 100644 --- a/src/msw/spinbutt.cpp +++ b/src/msw/spinbutt.cpp @@ -19,6 +19,7 @@ #ifdef __GNUG__ #pragma implementation "spinbutt.h" + #pragma implementation "spinbutbase.h" #endif // For compilers that support precompilation, includes "wx.h". @@ -37,12 +38,15 @@ #if wxUSE_SPINBTN +#include "wx/spinbutt.h" + +IMPLEMENT_DYNAMIC_CLASS(wxSpinEvent, wxNotifyEvent) + #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 @@ -55,7 +59,6 @@ // ---------------------------------------------------------------------------- IMPLEMENT_DYNAMIC_CLASS(wxSpinButton, wxControl) -IMPLEMENT_DYNAMIC_CLASS(wxSpinEvent, wxScrollEvent); // ---------------------------------------------------------------------------- // wxSpinButton @@ -103,10 +106,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 ) @@ -129,7 +134,7 @@ bool wxSpinButton::Create(wxWindow *parent, if ( !m_hWnd ) { - wxLogLastError("CreateUpDownControl"); + wxLogLastError(wxT("CreateUpDownControl")); return FALSE; } @@ -189,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?") ) @@ -207,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__) @@ -218,6 +223,9 @@ bool wxSpinButton::MSWOnNotify(int idCtrl, WXLPARAM lParam, WXLPARAM *result) LPNMUPDOWN lpnmud = (LPNMUPDOWN)lParam; #endif + 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, m_windowId); @@ -234,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;