Recent w32api have FONTENUMPROC; this also fixes GCC 3.1

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@15861 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/src/msw/fontenum.cpp b/src/msw/fontenum.cpp
index 553b574f7a4700b417f6c06668ce30320f900651..d538250cf91ef26f320d2725b439956b4fff9a57 100644 (file)
--- a/src/msw/fontenum.cpp
+++ b/src/msw/fontenum.cpp
@@ -146,7 +146,7 @@ bool wxFontEnumeratorHelper::SetEncoding(wxFontEncoding encoding)
     return TRUE;
 }
 
     return TRUE;
 }
 

-#if defined(__GNUWIN32__) && !defined(__CYGWIN10__)
+#if defined(__GNUWIN32__) && !defined(__CYGWIN10__) && !wxCHECK_W32API_VERSION( 1, 1 )

     #if wxUSE_NORLANDER_HEADERS
         #define wxFONTENUMPROC int(*)(const LOGFONT *, const TEXTMETRIC *, long unsigned int, LPARAM)
     #else
     #if wxUSE_NORLANDER_HEADERS
         #define wxFONTENUMPROC int(*)(const LOGFONT *, const TEXTMETRIC *, long unsigned int, LPARAM)
     #else