Removed re-definitions of Win32 things now ancient.
This commit is contained in:
parent
bae93ac1e1
commit
cd44a7182b
@ -73,92 +73,10 @@
|
|||||||
// Hack: Define things that some windows.h variants don't
|
// Hack: Define things that some windows.h variants don't
|
||||||
//========================================================================
|
//========================================================================
|
||||||
|
|
||||||
// Some old versions of w32api (used by MinGW and Cygwin) define
|
|
||||||
// WH_KEYBOARD_LL without typedef:ing KBDLLHOOKSTRUCT (!)
|
|
||||||
#if defined(__MINGW32__) || defined(__CYGWIN__)
|
|
||||||
#include <w32api.h>
|
|
||||||
#if defined(WH_KEYBOARD_LL) && (__W32API_MAJOR_VERSION == 1) && (__W32API_MINOR_VERSION <= 2)
|
|
||||||
#undef WH_KEYBOARD_LL
|
|
||||||
#endif
|
|
||||||
#endif
|
|
||||||
|
|
||||||
//------------------------------------------------------------------------
|
|
||||||
// ** NOTE ** If this gives you compiler errors and you are using MinGW
|
|
||||||
// (or Dev-C++), update to w32api version 1.3 or later:
|
|
||||||
// http://sourceforge.net/project/showfiles.php?group_id=2435
|
|
||||||
//------------------------------------------------------------------------
|
|
||||||
#ifndef WH_KEYBOARD_LL
|
|
||||||
#define WH_KEYBOARD_LL 13
|
|
||||||
typedef struct tagKBDLLHOOKSTRUCT {
|
|
||||||
DWORD vkCode;
|
|
||||||
DWORD scanCode;
|
|
||||||
DWORD flags;
|
|
||||||
DWORD time;
|
|
||||||
DWORD dwExtraInfo;
|
|
||||||
} KBDLLHOOKSTRUCT, FAR *LPKBDLLHOOKSTRUCT, *PKBDLLHOOKSTRUCT;
|
|
||||||
#endif // WH_KEYBOARD_LL
|
|
||||||
|
|
||||||
#ifndef LLKHF_ALTDOWN
|
|
||||||
#define LLKHF_ALTDOWN 0x00000020
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#ifndef SPI_SETSCREENSAVERRUNNING
|
|
||||||
#define SPI_SETSCREENSAVERRUNNING 97
|
|
||||||
#endif
|
|
||||||
#ifndef SPI_GETANIMATION
|
|
||||||
#define SPI_GETANIMATION 72
|
|
||||||
#endif
|
|
||||||
#ifndef SPI_SETANIMATION
|
|
||||||
#define SPI_SETANIMATION 73
|
|
||||||
#endif
|
|
||||||
#ifndef SPI_GETFOREGROUNDLOCKTIMEOUT
|
|
||||||
#define SPI_GETFOREGROUNDLOCKTIMEOUT 0x2000
|
|
||||||
#endif
|
|
||||||
#ifndef SPI_SETFOREGROUNDLOCKTIMEOUT
|
|
||||||
#define SPI_SETFOREGROUNDLOCKTIMEOUT 0x2001
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#ifndef CDS_FULLSCREEN
|
|
||||||
#define CDS_FULLSCREEN 4
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#ifndef PFD_GENERIC_ACCELERATED
|
|
||||||
#define PFD_GENERIC_ACCELERATED 0x00001000
|
|
||||||
#endif
|
|
||||||
#ifndef PFD_DEPTH_DONTCARE
|
|
||||||
#define PFD_DEPTH_DONTCARE 0x20000000
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#ifndef ENUM_CURRENT_SETTINGS
|
|
||||||
#define ENUM_CURRENT_SETTINGS -1
|
|
||||||
#endif
|
|
||||||
#ifndef ENUM_REGISTRY_SETTINGS
|
|
||||||
#define ENUM_REGISTRY_SETTINGS -2
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#ifndef WM_MOUSEWHEEL
|
|
||||||
#define WM_MOUSEWHEEL 0x020A
|
|
||||||
#endif
|
|
||||||
#ifndef WHEEL_DELTA
|
|
||||||
#define WHEEL_DELTA 120
|
|
||||||
#endif
|
|
||||||
#ifndef WM_MOUSEHWHEEL
|
#ifndef WM_MOUSEHWHEEL
|
||||||
#define WM_MOUSEHWHEEL 0x020E
|
#define WM_MOUSEHWHEEL 0x020E
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#ifndef WM_XBUTTONDOWN
|
|
||||||
#define WM_XBUTTONDOWN 0x020B
|
|
||||||
#endif
|
|
||||||
#ifndef WM_XBUTTONUP
|
|
||||||
#define WM_XBUTTONUP 0x020C
|
|
||||||
#endif
|
|
||||||
#ifndef XBUTTON1
|
|
||||||
#define XBUTTON1 1
|
|
||||||
#endif
|
|
||||||
#ifndef XBUTTON2
|
|
||||||
#define XBUTTON2 2
|
|
||||||
#endif
|
|
||||||
|
|
||||||
|
|
||||||
//========================================================================
|
//========================================================================
|
||||||
// DLLs that are loaded at glfwInit()
|
// DLLs that are loaded at glfwInit()
|
||||||
|
Loading…
Reference in New Issue
Block a user