X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/146477814355dfb48cf46ce2b68de2dcdac4596e..d80207c3445ece64793fc499818d4c7a3584e01f:/src/msw/fontenum.cpp?ds=sidebyside diff --git a/src/msw/fontenum.cpp b/src/msw/fontenum.cpp index b547ec12f4..7bf7c8df2b 100644 --- a/src/msw/fontenum.cpp +++ b/src/msw/fontenum.cpp @@ -32,6 +32,7 @@ #include "wx/font.h" #endif +#include "wx/fontutil.h" #include "wx/fontenum.h" #include "wx/fontmap.h" @@ -132,9 +133,9 @@ bool wxFontEnumeratorHelper::SetEncoding(wxFontEncoding encoding) return TRUE; } -#if defined(__GNUWIN32__) +#if defined(__GNUWIN32__) && !defined(__CYGWIN10__) #if wxUSE_NORLANDER_HEADERS - #define wxFONTENUMPROC int(*)(const LOGFONTA *, const TEXTMETRICA *, long unsigned int, LPARAM) + #define wxFONTENUMPROC int(*)(const LOGFONT *, const TEXTMETRIC *, long unsigned int, LPARAM) #else #define wxFONTENUMPROC int(*)(ENUMLOGFONTEX *, NEWTEXTMETRICEX*, int, LPARAM) #endif