Reverted patch [ 746201 ] (partially) because of unwanted side-effects

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

diff --git a/include/wx/msw/missing.h b/include/wx/msw/missing.h
index c29e85121e3ca99166b1d6e51032f65c60f6ae27..0868ea5735a81638c9c0e39379a1a8b48e2a904a 100644 (file)
--- a/include/wx/msw/missing.h
+++ b/include/wx/msw/missing.h
@@ -43,6 +43,10 @@
     #define LVCFMT_JUSTIFYMASK 0x0003
 #endif
 
+#ifndef LVSICF_NOSCROLL
+    #define LVSICF_NOSCROLL 0x0002
+#endif
+
 // mingw32/cygwin don't have declarations for comctl32.dll 4.70+ stuff
 #ifndef NM_CACHEHINT
     typedef struct tagNMLVCACHEHINT
@@ -100,7 +104,24 @@ typedef struct _LVITEMW {
     int iIndent;
 #endif
 } LV_ITEMW;
-typedef LV_ITEM LV_ITEMA;
+
+typedef struct tagLVITEMA
+{
+    UINT mask;
+    int iItem;
+    int iSubItem;
+    UINT state;
+    UINT stateMask;
+    LPSTR pszText;
+    int cchTextMax;
+    int iImage;
+    LPARAM lParam;
+#if (_WIN32_IE >= 0x0300)
+    int iIndent;
+#endif
+} LV_ITEMA;
+
+#define LV_ITEM LV_ITEMA;
 #endif
 
 #ifndef ListView_GetColumnWidth
@@ -142,6 +163,21 @@ typedef struct tagNMLVDISPINFOW {
 #endif
 #endif
 
+#if ((defined(__WATCOMC__) && __WATCOMC__ >= 1200) || defined(__GNUWIN32__) || defined (__MINGW32__) || defined(__DIGITALMARS__) || defined (__BORLANDC__)) && !defined(HDN_GETDISPINFOW)
+#define HDN_GETDISPINFOW (HDN_FIRST-29)
+#if !wxCHECK_W32API_VERSION(2, 2)
+typedef struct {
+        NMHDR hdr;
+        int iItem;
+        UINT mask;
+        LPWSTR pszText;
+        int cchTextMax;
+        int iImage;
+        LPARAM lParam;
+} NMHDDISPINFOW, *LPNMHDDISPINFOW;
+#endif
+#endif
+
 
 // ----------------------------------------------------------------------------
 // MS HTML Help
@@ -213,18 +249,12 @@ 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
+#ifndef WS_EX_CLIENTEDGE
+    #define WS_EX_CLIENTEDGE 0x00000200L
 #endif
 
+#ifndef ENDSESSION_LOGOFF
+    #define ENDSESSION_LOGOFF    0x80000000
 #endif
 
 #endif