wxFONTENUMPROC definition changed for mingwin 2.95

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

diff --git a/src/msw/fontenum.cpp b/src/msw/fontenum.cpp
index f21279e18273ab266b626171b9ed3805e7959c83..279f7be2aeb507a3649da892cc15154564c4a6be 100644 (file)
--- a/src/msw/fontenum.cpp
+++ b/src/msw/fontenum.cpp
@@ -110,8 +110,10 @@ bool wxFontEnumeratorHelper::SetEncoding(wxFontEncoding encoding)
     return TRUE;
 }
 
     return TRUE;
 }
 

-#if defined(__GNUWIN32__)
-    #define wxFONTENUMPROC int(*)(ENUMLOGFONTEX *, NEWTEXTMETRICEX*, int, LPARAM)
+#if defined(__GNUWIN32__)    
+    //BJ : FIXME? I have the second implementation in 2.95. Does it work with other versions?
+   // #define wxFONTENUMPROC int(*)(ENUMLOGFONTEX *, NEWTEXTMETRICEX*, int, LPARAM)
+    #define wxFONTENUMPROC int(*)(const LOGFONTA *, const TEXTMETRICA *, long unsigned int, LPARAM)

 #else
     #define wxFONTENUMPROC FONTENUMPROC
 #endif
 #else
     #define wxFONTENUMPROC FONTENUMPROC
 #endif