Mostly Mingw32/Cygwin corrections

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@5039 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
1999-12-20 19:04:48 +00:00
parent 83307f338d
commit c25a510b30
19 changed files with 65 additions and 23 deletions
--- 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