Put the reentrance check inside #ifdef __DEBUG__

[wxWidgets.git] / include / wx / msw / missing.h

diff --git a/include/wx/msw/missing.h b/include/wx/msw/missing.h
index accdcc2747bb635589a523e65fa8d976b9cd8794..dae3338a0fb2b869e80025e969d16d23f745850f 100644 (file)
--- a/include/wx/msw/missing.h
+++ b/include/wx/msw/missing.h
@@ -215,6 +215,10 @@ typedef struct _OSVERSIONINFOEX {
     #define LVM_SETEXTENDEDLISTVIEWSTYLE (0x1000 + 54)
 #endif
 
+#ifndef LVM_GETSUBITEMRECT
+    #define LVM_GETSUBITEMRECT           (0x1000 + 56)
+#endif
+
 #ifndef LVCF_IMAGE
     #define LVCF_IMAGE             0x0010
 #endif
@@ -232,6 +236,10 @@ typedef struct _OSVERSIONINFOEX {
     #define ListView_GetHeader(w) (HWND)SendMessage((w),LVM_GETHEADER,0,0)
 #endif
 
+#ifndef ListView_GetSubItemRect
+    #define ListView_GetSubItemRect(w, i, s, c, p) (HWND)SendMessage(w,LVM_GETSUBITEMRECT,i, ((p) ? ((((LPRECT)(p))->top = s), (((LPRECT)(p))->left = c), (LPARAM)(p)) : (LPARAM)(LPRECT)NULL))
+#endif
+
 #ifndef LVM_GETHEADER
     #define LVM_GETHEADER (LVM_FIRST+31)
 #endif
@@ -245,6 +253,53 @@ typedef struct _OSVERSIONINFOEX {
     #define CP_SYMBOL 42
 #endif
 
+// ----------------------------------------------------------------------------
+// wxDisplay
+// ----------------------------------------------------------------------------
+
+// The windows headers with Digital Mars lack some typedefs.
+// typedef them as my_XXX and then #define to rename to XXX in case
+// a newer version of Digital Mars fixes the headers
+// (or up to date PSDK is in use with older version)
+// also we use any required definition (MONITOR_DEFAULTTONULL) to recognize
+// whether whole missing block needs to be included
+
+#ifndef MONITOR_DEFAULTTONULL
+
+    #define HMONITOR_DECLARED
+    DECLARE_HANDLE(HMONITOR);
+    typedef BOOL(CALLBACK* my_MONITORENUMPROC)(HMONITOR,HDC,LPRECT,LPARAM);
+    #define MONITORENUMPROC my_MONITORENUMPROC
+    typedef struct my_tagMONITORINFO {
+        DWORD cbSize;
+        RECT rcMonitor;
+        RECT rcWork;
+        DWORD dwFlags;
+    } my_MONITORINFO,*my_LPMONITORINFO;
+    #define MONITORINFO my_MONITORINFO
+    #define LPMONITORINFO my_LPMONITORINFO
+
+    typedef struct my_MONITORINFOEX : public my_tagMONITORINFO
+    {
+        TCHAR       szDevice[CCHDEVICENAME];
+    } my_MONITORINFOEX, *my_LPMONITORINFOEX;
+    #define MONITORINFOEX my_MONITORINFOEX
+    #define LPMONITORINFOEX my_LPMONITORINFOEX
+
+    #ifndef MONITOR_DEFAULTTONULL
+        #define MONITOR_DEFAULTTONULL 0
+    #endif // MONITOR_DEFAULTTONULL
+
+    #ifndef MONITORINFOF_PRIMARY
+        #define MONITORINFOF_PRIMARY 1
+    #endif // MONITORINFOF_PRIMARY
+
+    #ifndef DDENUM_ATTACHEDSECONDARYDEVICES
+        #define DDENUM_ATTACHEDSECONDARYDEVICES 1
+    #endif
+
+#endif // MONITOR_DEFAULTTONULL
+
 // ----------------------------------------------------------------------------
 // Tree control
 // ----------------------------------------------------------------------------