more accurate best size calculation logic (use the current date format)

[wxWidgets.git] / src / msw / display.cpp

diff --git a/src/msw/display.cpp b/src/msw/display.cpp
index 536bd14811cd5d130fb9fcf3b69381972c9c5954..59367a8f7e949d6fc53042a8b022607792d43c2b 100644 (file)
--- a/src/msw/display.cpp
+++ b/src/msw/display.cpp
@@ -58,6 +58,19 @@
 
 #ifndef __WXWINCE__
     #include <multimon.h>
 
 #ifndef __WXWINCE__
     #include <multimon.h>

+
+    // HMONITOR can be declared either in new enough windef.h or in multimon.h
+    // itself if _WIN32_WINNT < 0x0500, but the trouble is that we set
+    // _WIN32_WINNT to maximal possible value ourselves in wx/msw/wrapwin.h so
+    // that multimon.h doesn't define it but with old headers, neither does
+    // windef.h, in spite of _WIN32_WINNT value. Even more 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);
+        #define HMONITOR_DECLARED
+    #endif

 #endif // !__WXWINCE__
 
 #ifdef _MSC_VER
 #endif // !__WXWINCE__
 
 #ifdef _MSC_VER