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 a81419d710d3b4646e5c5680d170ecc35c410c84..dae3338a0fb2b869e80025e969d16d23f745850f 100644 (file)
--- a/include/wx/msw/missing.h
+++ b/include/wx/msw/missing.h
@@ -34,12 +34,18 @@
     #define WM_UPDATEUISTATE    0x0128
 #endif
 
     #define WM_UPDATEUISTATE    0x0128
 #endif
 

+#ifndef WM_CHANGEUISTATE
+    #define WM_CHANGEUISTATE    0x0127
+#endif
+

 #ifndef WM_PRINTCLIENT
     #define WM_PRINTCLIENT 0x318
 #endif
 
 // Needed by toplevel.cpp
 #ifndef WM_PRINTCLIENT
     #define WM_PRINTCLIENT 0x318
 #endif
 
 // Needed by toplevel.cpp

-#ifndef UIS_INITIALIZE
+#ifndef UIS_SET
+    #define UIS_SET         1
+    #define UIS_CLEAR       2

     #define UIS_INITIALIZE  3
 #endif
 
     #define UIS_INITIALIZE  3
 #endif
 


@@ -90,6 +96,31 @@
     #define VK_OEM_PERIOD   0xBE
 #endif
 
     #define VK_OEM_PERIOD   0xBE
 #endif
 

+#ifndef SM_TABLETPC
+    #define SM_TABLETPC 86
+#endif
+
+#ifndef INKEDIT_CLASS
+#   define INKEDIT_CLASSW  L"INKEDIT"
+#   ifdef UNICODE
+#       define INKEDIT_CLASS   INKEDIT_CLASSW
+#   else
+#       define INKEDIT_CLASS   "INKEDIT"
+#   endif
+#endif
+
+#ifndef EM_SETINKINSERTMODE
+#   define EM_SETINKINSERTMODE (WM_USER + 0x0204)
+#endif
+
+#ifndef EM_SETUSEMOUSEFORINPUT
+#define EM_SETUSEMOUSEFORINPUT (WM_USER + 0x224)
+#endif
+
+#ifndef TPM_RECURSE
+#define TPM_RECURSE 1
+#endif
+

 // ----------------------------------------------------------------------------
 // ListView common control
 // Needed by listctrl.cpp
 // ----------------------------------------------------------------------------
 // ListView common control
 // Needed by listctrl.cpp


@@ -103,6 +134,14 @@
     #define LVS_EX_LABELTIP 0x00004000
 #endif
 
     #define LVS_EX_LABELTIP 0x00004000
 #endif
 

+#ifndef LVS_EX_SUBITEMIMAGES
+    #define LVS_EX_SUBITEMIMAGES 0x00000002
+#endif
+
+#ifndef HDN_GETDISPINFOW
+    #define HDN_GETDISPINFOW (HDN_FIRST-29)
+#endif
+

  /*
   * In addition to the above, the following are required for several compilers.
   */
  /*
   * In addition to the above, the following are required for several compilers.
   */


@@ -119,6 +158,31 @@
     #define CFM_BACKCOLOR 0x04000000
 #endif
 
     #define CFM_BACKCOLOR 0x04000000
 #endif
 

+#ifndef HANGUL_CHARSET
+    #define HANGUL_CHARSET 129
+#endif
+
+#ifndef CCM_SETUNICODEFORMAT
+    #define CCM_SETUNICODEFORMAT 8197
+#endif
+
+// ----------------------------------------------------------------------------
+// Tree control
+// ----------------------------------------------------------------------------
+
+#ifndef TV_FIRST
+    #define TV_FIRST                0x1100
+#endif
+
+#ifndef TVS_FULLROWSELECT
+    #define TVS_FULLROWSELECT       0x1000
+#endif
+
+#ifndef TVM_SETBKCOLOR
+    #define TVM_SETBKCOLOR          (TV_FIRST + 29)
+    #define TVM_SETTEXTCOLOR        (TV_FIRST + 30)
+#endif
+

  /*
   * The following are required for BC++ 5.5 (none at present.)
   */
  /*
   * The following are required for BC++ 5.5 (none at present.)
   */


@@ -129,20 +193,32 @@
 
 #ifdef __DMC__
 
 
 #ifdef __DMC__
 

-#ifndef CCM_SETUNICODEFORMAT
-    #define CCM_SETUNICODEFORMAT 8197
-#endif
+typedef struct _OSVERSIONINFOEX {
+    DWORD dwOSVersionInfoSize;
+    DWORD dwMajorVersion;
+    DWORD dwMinorVersion;
+    DWORD dwBuildNumber;
+    DWORD dwPlatformId;
+    TCHAR szCSDVersion[ 128 ];
+    WORD  wServicePackMajor;
+    WORD  wServicePackMinor;
+    WORD  wSuiteMask;
+    BYTE  wProductType;
+    BYTE  wReserved;
+} OSVERSIONINFOEX;

 
 

-#ifdef __DMC__
-    #ifndef _TrackMouseEvent
-        #define _TrackMouseEvent TrackMouseEvent
-    #endif
+#ifndef _TrackMouseEvent
+    #define _TrackMouseEvent TrackMouseEvent

 #endif
 
 #ifndef LVM_SETEXTENDEDLISTVIEWSTYLE
     #define LVM_SETEXTENDEDLISTVIEWSTYLE (0x1000 + 54)
 #endif
 
 #endif
 
 #ifndef LVM_SETEXTENDEDLISTVIEWSTYLE
     #define LVM_SETEXTENDEDLISTVIEWSTYLE (0x1000 + 54)
 #endif
 

+#ifndef LVM_GETSUBITEMRECT
+    #define LVM_GETSUBITEMRECT           (0x1000 + 56)
+#endif
+

 #ifndef LVCF_IMAGE
     #define LVCF_IMAGE             0x0010
 #endif
 #ifndef LVCF_IMAGE
     #define LVCF_IMAGE             0x0010
 #endif


@@ -156,14 +232,14 @@
     #define HDM_GETITEMRECT (HDM_FIRST+7)
 #endif
 
     #define HDM_GETITEMRECT (HDM_FIRST+7)
 #endif
 

-#ifndef HDN_GETDISPINFOW
-    #define HDN_GETDISPINFOW (HDN_FIRST-29)
-#endif
-

 #ifndef ListView_GetHeader
     #define ListView_GetHeader(w) (HWND)SendMessage((w),LVM_GETHEADER,0,0)
 #endif
 
 #ifndef ListView_GetHeader
     #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
 #ifndef LVM_GETHEADER
     #define LVM_GETHEADER (LVM_FIRST+31)
 #endif


@@ -173,6 +249,57 @@
     #define LVSICF_NOSCROLL         0x0002
 #endif
 
     #define LVSICF_NOSCROLL         0x0002
 #endif
 

+#ifndef CP_SYMBOL
+    #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
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // Tree control
 // ----------------------------------------------------------------------------


@@ -181,21 +308,12 @@
     #define TVIS_FOCUSED            0x0001
 #endif
 
     #define TVIS_FOCUSED            0x0001
 #endif
 

-#ifndef TV_FIRST
-    #define TV_FIRST                0x1100
-#endif
-

 #ifndef TVS_CHECKBOXES
     #define TVS_CHECKBOXES          0x0100
 #endif
 
 #ifndef TVS_CHECKBOXES
     #define TVS_CHECKBOXES          0x0100
 #endif
 

-#ifndef TVS_FULLROWSELECT
-    #define TVS_FULLROWSELECT       0x1000
-#endif
-
-#ifndef TVM_SETBKCOLOR
-    #define TVM_SETBKCOLOR          (TV_FIRST + 29)
-    #define TVM_SETTEXTCOLOR        (TV_FIRST + 30)
+#ifndef TVITEM
+    #define TVITEM TV_ITEM

 #endif
 
 #endif
 #endif
 
 #endif


@@ -225,4 +343,3 @@
 
 #endif
     // _WX_MISSING_H_
 
 #endif
     // _WX_MISSING_H_

-