Small speed up to fonts and support for scaling.

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

diff --git a/include/wx/msw/gccpriv.h b/include/wx/msw/gccpriv.h
index 41d363014aa15d48e6a460aaa2ab9873d6197afb..de45b8160a3bd15663b1e74516dc0bb58aedaf43 100644 (file)
--- a/include/wx/msw/gccpriv.h
+++ b/include/wx/msw/gccpriv.h
@@ -3,13 +3,17 @@
 #ifndef _WX_MSW_GCCPRIV_H_
 #define _WX_MSW_GCCPRIV_H_
 
 #ifndef _WX_MSW_GCCPRIV_H_
 #define _WX_MSW_GCCPRIV_H_
 

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

+#elif defined( __CYGWIN__ ) && !defined( HAVE_W32API_H )
+    #if ( __GNUC__ > 2 ) 
+        #define HAVE_W32API_H
+    #endif

 #endif
 
 // check for MinGW/Cygwin w32api version ( releases >= 0.5, only )
 #endif
 
 // check for MinGW/Cygwin w32api version ( releases >= 0.5, only )


@@ -24,7 +28,7 @@
 
 // Cygwin / Mingw32 with gcc >= 2.95 use new windows headers which
 // are more ms-like (header author is Anders Norlander, hence the name)
 
 // Cygwin / Mingw32 with gcc >= 2.95 use new windows headers which
 // are more ms-like (header author is Anders Norlander, hence the name)

-#if (defined(__MINGW32__) || defined(__CYGWIN__)) && ((__GNUC__>2) || ((__GNUC__==2) && (__GNUC_MINOR__>=95)))
+#if (defined(__MINGW32__) || defined(__CYGWIN__) || defined(__WINE__)) && ((__GNUC__>2) || ((__GNUC__==2) && (__GNUC_MINOR__>=95)))

     #ifndef wxUSE_NORLANDER_HEADERS
         #define wxUSE_NORLANDER_HEADERS 1
     #endif
     #ifndef wxUSE_NORLANDER_HEADERS
         #define wxUSE_NORLANDER_HEADERS 1
     #endif