reverted Julian's unintentional breakage of wxChoice

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

diff --git a/include/wx/msw/gccpriv.h b/include/wx/msw/gccpriv.h
index a134514de5179d4091fa25f1c3d2af77b3919239..c0e84b250b3b59f00cad8dc70812d75999ab1abf 100644 (file)
--- a/include/wx/msw/gccpriv.h
+++ b/include/wx/msw/gccpriv.h
@@ -3,10 +3,12 @@
 #ifndef _WX_MSW_GCCPRIV_H_
 #define _WX_MSW_GCCPRIV_H_
 
 #ifndef _WX_MSW_GCCPRIV_H_
 #define _WX_MSW_GCCPRIV_H_
 

-#if defined( __MINGW32__ )
-    //#include <_mingw.h>
-    #if __MINGW32_MAJOR_VERSION >= 1
-        #define HAVE_W32API_H
+#if defined( __MINGW32__ ) && !defined( HAVE_W32API_H )
+    #if ( __GNUC__ > 2 ) || ( ( __GNUC__ == 2 ) && ( __GNUC_MINOR__ >= 95 ) )
+        #include <_mingw.h>
+        #if __MINGW32_MAJOR_VERSION >= 1
+            #define HAVE_W32API_H
+        #endif

     #endif
 #endif
 
     #endif
 #endif
 


@@ -44,5 +46,32 @@
     #define __CYGWIN10__
 #endif
 
     #define __CYGWIN10__
 #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 )
+    #ifndef _tsetlocale
+      #if wxUSE_UNICODE
+      #define _tsetlocale _wsetlocale
+      #else
+      #define _tsetlocale setlocale
+      #endif
+    #endif
+    #ifndef _tgetenv
+      #if wxUSE_UNICODE
+      #define _tgetenv _wgetenv
+      #else
+      #define _tgetenv getenv
+      #endif
+    #endif
+    #ifndef _tfopen
+      #if wxUSE_UNICODE
+      #define _tfopen _wfopen
+      #else
+      #define _tfopen fopen
+      #endif
+    #endif
+#endif
+
+

 #endif
   // _WX_MSW_GCCPRIV_H_
 #endif
   // _WX_MSW_GCCPRIV_H_