From e950e4a129a95b6f79807a7338dbb68bace3ac13 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C4=83t=C4=83lin=20R=C4=83ceanu?= Date: Sun, 5 Mar 2017 18:01:22 +0200 Subject: [PATCH] Remove MONITOR-related declarations not needed any more Don't define MONITOR-related structs and messages ourselves in wxMSW code, this shouldn't be needed any more as they're present in all remotely recent versions of the SDK. No real changes, just minor clean up. --- src/msw/display.cpp | 25 ------------------------- 1 file changed, 25 deletions(-) diff --git a/src/msw/display.cpp b/src/msw/display.cpp index 5714ae053c..961350a4cf 100644 --- a/src/msw/display.cpp +++ b/src/msw/display.cpp @@ -43,31 +43,6 @@ #include "wx/msw/private.h" #include "wx/msw/private/hiddenwin.h" - // Older versions of windef.h don't define HMONITOR. Unfortunately, we - // can't directly test whether HMONITOR is defined or not in windef.h as - // it's not a macro but a typedef, so we test for an unrelated symbol which - // is only defined in winuser.h if WINVER >= 0x0500 - #if !defined(HMONITOR_DECLARED) && !defined(MNS_NOCHECK) - DECLARE_HANDLE(HMONITOR); - typedef BOOL(CALLBACK * MONITORENUMPROC )(HMONITOR, HDC, LPRECT, LPARAM); - typedef struct tagMONITORINFO - { - DWORD cbSize; - RECT rcMonitor; - RECT rcWork; - DWORD dwFlags; - } MONITORINFO, *LPMONITORINFO; - typedef struct tagMONITORINFOEX : public tagMONITORINFO - { - TCHAR szDevice[CCHDEVICENAME]; - } MONITORINFOEX, *LPMONITORINFOEX; - #define MONITOR_DEFAULTTONULL 0x00000000 - #define MONITOR_DEFAULTTOPRIMARY 0x00000001 - #define MONITOR_DEFAULTTONEAREST 0x00000002 - #define MONITORINFOF_PRIMARY 0x00000001 - #define HMONITOR_DECLARED - #endif - static const wxChar displayDllName[] = wxT("user32.dll"); // ----------------------------------------------------------------------------