From: Bart A.M. Jourquin <bart.jourquin@fucam.ac.be>
Date: Fri, 7 Jan 2000 11:06:39 +0000 (+0000)
Subject: wxFONTENUMPROC definition changed for mingwin 2.95
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/1b6d97f9b8409a83be45fed39324101aeab27db8?ds=sidebyside;hp=fc3463cc7e63df36366dc3b2503b635f9b209097

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 f21279e182..279f7be2ae 100644
--- a/src/msw/fontenum.cpp
+++ b/src/msw/fontenum.cpp
@@ -110,8 +110,10 @@ bool wxFontEnumeratorHelper::SetEncoding(wxFontEncoding encoding)
     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