added ClassRegistrar (wraps Register/UnregisterClass Win32 API calls)

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

diff --git a/include/wx/msw/gccpriv.h b/include/wx/msw/gccpriv.h
index b2150285f62f0e847bd624121a9eea7f5b1db831..20dc5c11d11ce99515800335693f20fc12634286 100644 (file)
--- a/include/wx/msw/gccpriv.h
+++ b/include/wx/msw/gccpriv.h
@@ -16,12 +16,12 @@
         #endif
     #endif
 #elif defined( __CYGWIN__ ) && !defined( HAVE_W32API_H )
-    #if ( __GNUC__ > 2 ) 
+    #if ( __GNUC__ > 2 )
         #define HAVE_W32API_H
     #endif
 #endif
 
-#if (defined(__WATCOMC__) && __WATCOMC__ >= 1200) || defined(__DIGITALMARS__)
+#if (defined(__WATCOMC__) && __WATCOMC__ >= 1200)
     #define HAVE_W32API_H
 #endif
 
@@ -30,10 +30,14 @@
 #include <w32api.h>
 #endif
 
-#define wxCHECK_W32API_VERSION( major, minor ) \
- ( defined( __W32API_MAJOR_VERSION ) && defined( __W32API_MINOR_VERSION ) \
- && ( ( __W32API_MAJOR_VERSION > (major) ) \
+/* Watcom can't handle defined(xxx) here: */
+#if defined(__W32API_MAJOR_VERSION) && defined(__W32API_MINOR_VERSION)
+    #define wxCHECK_W32API_VERSION( major, minor ) \
+ ( ( ( __W32API_MAJOR_VERSION > (major) ) \
       || ( __W32API_MAJOR_VERSION == (major) && __W32API_MINOR_VERSION >= (minor) ) ) )
+#else
+    #define wxCHECK_W32API_VERSION( major, minor ) (0)
+#endif
 
 /* Cygwin / Mingw32 with gcc >= 2.95 use new windows headers which
    are more ms-like (header author is Anders Norlander, hence the name) */
@@ -59,7 +63,15 @@
     #define __CYGWIN10__
 #endif
 
-#ifndef __WATCOMC__ /* this workarounds a bug in Watcom's parser */
+/* 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 ) \
@@ -86,8 +98,18 @@
       #endif
     #endif
 #endif
-#endif /* __WATCOMC__ */
 
+// current (= before mingw-runtime 3.3) mingw32 headers forget to
+// define _puttchar, this will probably be fixed in the next versions but
+// for now do it ourselves
+#if defined( __MINGW32__ ) && \
+        !wxCHECK_MINGW32_VERSION(3,3) && !defined( _puttchar )
+    #ifdef wxUSE_UNICODE
+        #define  _puttchar   putwchar
+    #else
+        #define  _puttchar   puttchar
+    #endif
+#endif
 
 #endif
   /* _WX_MSW_GCCPRIV_H_ */