diff --git a/include/wx/msw/missing.h b/include/wx/msw/missing.h
index 7243690420..cf63f3ec4f 100644
--- a/include/wx/msw/missing.h
+++ b/include/wx/msw/missing.h
@@ -159,6 +159,9 @@ typedef struct tagNMLVDISPINFOW {
 #endif
 #endif
 
+#ifndef HDN_GETDISPINFOW
+#define HDN_GETDISPINFOW (HDN_FIRST-29)
+#endif
 
 // ----------------------------------------------------------------------------
 // MS HTML Help
diff --git a/src/makeg95.env b/src/makeg95.env
index 64c74fa705..4e4bccde08 100644
--- a/src/makeg95.env
+++ b/src/makeg95.env
@@ -15,8 +15,8 @@
 MINGW32=1
 
 # Set to the version you have
-MINGW32VERSION=2.95
-#MINGW32VERSION=3.0
+#MINGW32VERSION=2.95
+MINGW32VERSION=3.0
 
 # If we're using MSYS, or other utilities that
 # use forward slashes, we need to set this when
diff --git a/src/msw/listctrl.cpp b/src/msw/listctrl.cpp
index b6d25067aa..4cc1fab8d1 100644
--- a/src/msw/listctrl.cpp
+++ b/src/msw/listctrl.cpp
@@ -1762,6 +1762,12 @@ bool wxListCtrl::MSWOnNotify(int idCtrl, WXLPARAM lParam, WXLPARAM *result)
                 
             case HDN_GETDISPINFOW:
                 {
+#ifdef __GNUWIN32__
+                    // Can someone test if this is OK on XP? Otherwise
+                    // we will have to define LPNMHDDISPINFOW for MinGW/Cygwin
+                    // and do as below.
+                    return TRUE;
+#else                    
                     LPNMHDDISPINFOW info = (LPNMHDDISPINFOW) lParam;
                     // This is a fix for a strange bug under XP.
                     // Normally, info->iItem is a valid index, but
@@ -1775,6 +1781,7 @@ bool wxListCtrl::MSWOnNotify(int idCtrl, WXLPARAM lParam, WXLPARAM *result)
                         return TRUE;
                     else
                         return wxControl::MSWOnNotify(idCtrl, lParam, result);
+#endif
                 }
             default:
                 return wxControl::MSWOnNotify(idCtrl, lParam, result);