Allow headers to be compiled in Objective-C++ mode

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

diff --git a/include/wx/msw/missing.h b/include/wx/msw/missing.h
index 631006ba340326b0bec185ba33c2b07852d9820a..62c8c2a762686ea9854221753e252c5cf7adda2e 100644 (file)
--- a/include/wx/msw/missing.h
+++ b/include/wx/msw/missing.h
@@ -159,8 +159,9 @@ typedef struct tagNMLVDISPINFOW {
 #endif
 #endif
 
-#if defined(__GNUWIN32__) && !defined(HDN_GETDISPINFOW)
+#if ((defined(__WATCOMC__) && __WATCOMC__ >= 1200) || defined(__GNUWIN32__) || defined (__BORLANDC__)) && !defined(HDN_GETDISPINFOW)
 #define HDN_GETDISPINFOW (HDN_FIRST-29)
+#if !wxCHECK_W32API_VERSION(2, 2)
 typedef struct {
         NMHDR hdr;
         int iItem;
@@ -171,6 +172,7 @@ typedef struct {
         LPARAM lParam;
 } NMHDDISPINFOW, *LPNMHDDISPINFOW;
 #endif
+#endif
 
 
 // ----------------------------------------------------------------------------
@@ -243,19 +245,5 @@ struct HH_AKLINK
     #define QS_ALLPOSTMESSAGE    0x0100
 #endif
 
-#ifdef __WXWINE__
-#define LV_ITEMA LVITEMA
-#define LV_ITEMW LVITEMW
-#define LV_DISPINFOA NMLVDISPINFOA
-#define LV_DISPINFOW NMLVDISPINFOW
-
-#if wxUSE_UNICODE
-#define LV_FINDINFO LVFINDINFOW
-#else
-#define LV_FINDINFO LVFINDINFOA
-#endif
-
-#endif
-
 #endif
     // _WX_MISSING_H_