X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/3cdb471c6a6027f336b793d141f7ba976c083e2c..0148fe1e2a2ea076bcd7a647c0b7946de0e0f990:/src/msw/fontenum.cpp?ds=sidebyside diff --git a/src/msw/fontenum.cpp b/src/msw/fontenum.cpp index 7021de27dc..9d7e1820d0 100644 --- a/src/msw/fontenum.cpp +++ b/src/msw/fontenum.cpp @@ -110,7 +110,9 @@ bool wxFontEnumeratorHelper::SetEncoding(wxFontEncoding encoding) return TRUE; } -#ifdef __GNUWIN32_OLD__ +// I've no idea what __GNUWIN32_OLD__ is. Anyway, I had to add the 2nd condition +// for Cygwin b20 (JACS) +#if (defined(__GNUWIN32_OLD__) || defined(__GNUWIN32__)) && !defined(__MINGW32__) #define wxFONTENUMPROC int(*)(ENUMLOGFONTEX *, NEWTEXTMETRICEX*, int, LPARAM) #else #define wxFONTENUMPROC FONTENUMPROC @@ -129,7 +131,12 @@ void wxFontEnumeratorHelper::DoEnumerate() (LPARAM)this, 0 /* reserved */) ; #else // Win16 ::EnumFonts(hDC, (LPTSTR)NULL, (FONTENUMPROC)wxFontEnumeratorProc, - (LPARAM) (void*) this) ; + #ifdef STRICT + (LPARAM) + #else + (LPSTR) + #endif + this); #endif // Win32/16 ::ReleaseDC(NULL, hDC);