Make wxComboCtrlBase::Set*groundColour() methods public.

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

diff --git a/include/wx/msw/gccpriv.h b/include/wx/msw/gccpriv.h
index bb557b4cc02459e424cc3304a5ae25d1915f37d7..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:
  Author:      Vadim Zeitlin
  Modified by:
  Created:

- RCS-ID:      $Id$

  Copyright:   (c) Vadim Zeitlin
  Licence:     wxWindows Licence
 */
  Copyright:   (c) Vadim Zeitlin
  Licence:     wxWindows Licence
 */


@@ -32,7 +31,7 @@
     #endif
 #endif
 
     #endif
 #endif
 

-#if (defined(__WATCOMC__) && __WATCOMC__ >= 1200)
+#if wxCHECK_WATCOM_VERSION(1,0)

     #define HAVE_W32API_H
 #endif
 
     #define HAVE_W32API_H
 #endif
 


@@ -74,15 +73,6 @@
     #define __CYGWIN10__
 #endif
 
     #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 ) \
 /* Mingw runtime 1.0-20010604 has some missing _tXXXX functions,
    so let's define them ourselves: */
 #if defined(__GNUWIN32__) && wxCHECK_W32API_VERSION( 1, 0 ) \