Fix wxPropertyGrid::GetPropertyRect when the last item is collapsed.

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

diff --git a/include/wx/msw/gccpriv.h b/include/wx/msw/gccpriv.h
index e90318cf087044bb9b2963a357cd4b28a2e41e8a..31453015b216db5df451ca5cfb0d91b8bb68d745 100644 (file)
--- a/include/wx/msw/gccpriv.h
+++ b/include/wx/msw/gccpriv.h
@@ -4,7 +4,6 @@
  Author:      Vadim Zeitlin
  Modified by:
  Created:
- RCS-ID:      $Id$
  Copyright:   (c) Vadim Zeitlin
  Licence:     wxWindows Licence
 */
@@ -18,7 +17,7 @@
     #define __GNUWIN32__
 #endif
 
-#if ( __GNUC__ > 2 ) || ( ( __GNUC__ == 2 ) && ( __GNUC_MINOR__ >= 95 ) )
+#if defined(__MINGW32__) && ( ( __GNUC__ > 2 ) || ( ( __GNUC__ == 2 ) && ( __GNUC_MINOR__ >= 95 ) ) )
     #include <_mingw.h>
 #endif
 
@@ -32,7 +31,7 @@
     #endif
 #endif
 
-#if (defined(__WATCOMC__) && __WATCOMC__ >= 1200)
+#if wxCHECK_WATCOM_VERSION(1,0)
     #define HAVE_W32API_H
 #endif
 
@@ -74,15 +73,6 @@
     #define __CYGWIN10__
 #endif
 
-/* Check for Mingw runtime version: */
-#if defined(__MINGW32_MAJOR_VERSION) && defined(__MINGW32_MINOR_VERSION)
-    #define wxCHECK_MINGW32_VERSION( major, minor ) \
- ( ( ( __MINGW32_MAJOR_VERSION > (major) ) \
-      || ( __MINGW32_MAJOR_VERSION == (major) && __MINGW32_MINOR_VERSION >= (minor) ) ) )
-#else
-    #define wxCHECK_MINGW32_VERSION( major, minor ) (0)
-#endif
-
 /* Mingw runtime 1.0-20010604 has some missing _tXXXX functions,
    so let's define them ourselves: */
 #if defined(__GNUWIN32__) && wxCHECK_W32API_VERSION( 1, 0 ) \