projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
More small fixes
[wxWidgets.git]
/
src
/
msw
/
spinbutt.cpp
diff --git
a/src/msw/spinbutt.cpp
b/src/msw/spinbutt.cpp
index 03428c16ee3a8ada3d7a41904846304c5e81e7c6..215abe2427ff117efdb10928f07f54a729de9713 100644
(file)
--- a/
src/msw/spinbutt.cpp
+++ b/
src/msw/spinbutt.cpp
@@
-46,7
+46,7
@@
IMPLEMENT_DYNAMIC_CLASS(wxSpinEvent, wxNotifyEvent)
#include "wx/msw/private.h"
#include "wx/msw/private.h"
-#if defined(__WIN95__) && !(
defined(__GNUWIN32_OLD__) || defined(__TWIN32
__))
+#if defined(__WIN95__) && !(
(defined(__GNUWIN32_OLD__) || defined(__TWIN32__)) && !defined(__CYGWIN10
__))
#include <commctrl.h>
#endif
#include <commctrl.h>
#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
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 )
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));
}
(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?") )
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);
}
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__)
{
#ifndef __GNUWIN32__
#if defined(__BORLANDC__) || defined(__WATCOMC__)
@@
-240,7
+242,7
@@
bool wxSpinButton::MSWOnNotify(int idCtrl, WXLPARAM lParam, WXLPARAM *result)
#endif
}
#endif
}
-bool wxSpinButton::MSWCommand(WXUINT
cmd, WXWORD id
)
+bool wxSpinButton::MSWCommand(WXUINT
WXUNUSED(cmd), WXWORD WXUNUSED(id)
)
{
// No command messages
return FALSE;
{
// No command messages
return FALSE;