File tree Expand file tree Collapse file tree 2 files changed +18
-4
lines changed Expand file tree Collapse file tree 2 files changed +18
-4
lines changed Original file line number Diff line number Diff line change 77#define WIN32_LEAN_AND_MEAN
88// Windows 10, for latest HiDPI API support.
99#define WINVER 0x0A00
10- #define _WIN32_WINNT 0x0A00
10+ #if defined(_WIN32_WINNT)
11+ #if _WIN32_WINNT < WINVER
12+ #undef _WIN32_WINNT
13+ #define _WIN32_WINNT WINVER
14+ #endif
15+ #else
16+ #define _WIN32_WINNT WINVER
17+ #endif
1118#endif
1219#include < pybind11/pybind11.h>
1320#ifdef __linux__
@@ -125,7 +132,7 @@ static void
125132mpl_SetForegroundWindow (py::capsule UNUSED_ON_NON_WINDOWS (handle_p))
126133{
127134#ifdef _WIN32
128- if (handle_p.name () != " HWND" ) {
135+ if (strcmp ( handle_p.name (), " HWND" ) != 0 ) {
129136 throw std::runtime_error (" Handle must be a value returned from Win32_GetForegroundWindow" );
130137 }
131138 HWND handle = static_cast <HWND>(handle_p.get_pointer ());
@@ -158,7 +165,7 @@ mpl_SetProcessDpiAwareness_max(void)
158165 DPI_AWARENESS_CONTEXT_SYSTEM_AWARE}; // Win10
159166 if (IsValidDpiAwarenessContextPtr != NULL
160167 && SetProcessDpiAwarenessContextPtr != NULL ) {
161- for (int i = 0 ; i < sizeof (ctxs) / sizeof (DPI_AWARENESS_CONTEXT); ++i) {
168+ for (size_t i = 0 ; i < sizeof (ctxs) / sizeof (DPI_AWARENESS_CONTEXT); ++i) {
162169 if (IsValidDpiAwarenessContextPtr (ctxs[i])) {
163170 SetProcessDpiAwarenessContextPtr (ctxs[i]);
164171 break ;
Original file line number Diff line number Diff line change 1919#define WIN32_LEAN_AND_MEAN
2020// Windows 8.1
2121#define WINVER 0x0603
22- #define _WIN32_WINNT 0x0603
22+ #if defined(_WIN32_WINNT)
23+ #if _WIN32_WINNT < WINVER
24+ #undef _WIN32_WINNT
25+ #define _WIN32_WINNT WINVER
26+ #endif
27+ #else
28+ #define _WIN32_WINNT WINVER
29+ #endif
2330#endif
2431
2532#include < pybind11/pybind11.h>
You can’t perform that action at this time.
0 commit comments