From 1b6d97f9b8409a83be45fed39324101aeab27db8 Mon Sep 17 00:00:00 2001 From: "Bart A.M. Jourquin" Date: Fri, 7 Jan 2000 11:06:39 +0000 Subject: [PATCH] wxFONTENUMPROC definition changed for mingwin 2.95 git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@5289 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/msw/fontenum.cpp | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) 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 -- 2.45.2