diff options
| author | Don Kjer <don@lindenlab.com> | 2007-05-04 21:57:06 +0000 |
|---|---|---|
| committer | Don Kjer <don@lindenlab.com> | 2007-05-04 21:57:06 +0000 |
| commit | 70aaa3e444cf9cb067addcbdde237762bd62fcf4 (patch) | |
| tree | 4013659d2335c4681b8c93ea795cf8ccb8aa55cd /indra/llwindow | |
| parent | 08d746156b56d8b72919af8cbca25609c855ef82 (diff) | |
svn merge -r 61148:61343 svn+ssh://svn/svn/linden/branches/maintenance into release
Diffstat (limited to 'indra/llwindow')
| -rw-r--r-- | indra/llwindow/llwindowwin32.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/indra/llwindow/llwindowwin32.cpp b/indra/llwindow/llwindowwin32.cpp index a589bf29f9..e6bce27ce2 100644 --- a/indra/llwindow/llwindowwin32.cpp +++ b/indra/llwindow/llwindowwin32.cpp @@ -34,8 +34,12 @@ #include "indra_constants.h" // culled from winuser.h +#ifndef WM_MOUSEWHEEL /* Added to be compatible with later SDK's */ const S32 WM_MOUSEWHEEL = 0x020A; +#endif +#ifndef WHEEL_DELTA /* Added to be compatible with later SDK's */ const S32 WHEEL_DELTA = 120; /* Value for rolling one detent */ +#endif const S32 MAX_MESSAGE_PER_UPDATE = 20; const S32 BITS_PER_PIXEL = 32; const S32 MAX_NUM_RESOLUTIONS = 32; |