From e08d12e3d6c71ad4dde001998f3479cfd40ec61a Mon Sep 17 00:00:00 2001 From: Neil Date: Sun, 12 Jan 2014 15:19:45 +1100 Subject: Remove old workarounds for system headers missing elements. --- win32/PlatWin.cxx | 31 +------------------------------ 1 file changed, 1 insertion(+), 30 deletions(-) (limited to 'win32/PlatWin.cxx') diff --git a/win32/PlatWin.cxx b/win32/PlatWin.cxx index 90deb44e3..f67bcf7fb 100644 --- a/win32/PlatWin.cxx +++ b/win32/PlatWin.cxx @@ -49,42 +49,13 @@ #define SPI_GETFONTSMOOTHINGCONTRAST 0x200C #endif -// Take care of 32/64 bit pointers -#ifdef GetWindowLongPtr static void *PointerFromWindow(HWND hWnd) { return reinterpret_cast(::GetWindowLongPtr(hWnd, 0)); } + static void SetWindowPointer(HWND hWnd, void *ptr) { ::SetWindowLongPtr(hWnd, 0, reinterpret_cast(ptr)); } -#else -static void *PointerFromWindow(HWND hWnd) { - return reinterpret_cast(::GetWindowLong(hWnd, 0)); -} -static void SetWindowPointer(HWND hWnd, void *ptr) { - ::SetWindowLong(hWnd, 0, reinterpret_cast(ptr)); -} - -#ifndef GWLP_USERDATA -#define GWLP_USERDATA GWL_USERDATA -#endif - -#ifndef GWLP_WNDPROC -#define GWLP_WNDPROC GWL_WNDPROC -#endif - -#ifndef LONG_PTR -#define LONG_PTR LONG -#endif - -static LONG_PTR SetWindowLongPtr(HWND hWnd, int nIndex, LONG_PTR dwNewLong) { - return ::SetWindowLong(hWnd, nIndex, dwNewLong); -} - -static LONG_PTR GetWindowLongPtr(HWND hWnd, int nIndex) { - return ::GetWindowLong(hWnd, nIndex); -} -#endif extern UINT CodePageFromCharSet(DWORD characterSet, UINT documentCodePage); -- cgit v1.2.3