Correct deafult GUI font is now found when querying

[wxWidgets.git] / src / msw / fontenum.cpp

diff --git a/src/msw/fontenum.cpp b/src/msw/fontenum.cpp
index 9b8405089a56c0cbd91ef051f812c461e8a0e55d..9d7e1820d03f22e2b29584dd4cabc25585c6a901 100644 (file)
--- a/src/msw/fontenum.cpp
+++ b/src/msw/fontenum.cpp
@@ -110,10 +110,12 @@ bool wxFontEnumeratorHelper::SetEncoding(wxFontEncoding encoding)
     return TRUE;
 }
 
     return TRUE;
 }
 

-#if defined(__GNUWIN32__) && !defined(__MINGW32__)
-#define wxFONTENUMPROC int(*)(ENUMLOGFONTEX *, NEWTEXTMETRICEX*, int, LPARAM)
+// 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
 #else

-#define wxFONTENUMPROC FONTENUMPROC
+    #define wxFONTENUMPROC FONTENUMPROC

 #endif
 
 void wxFontEnumeratorHelper::DoEnumerate()
 #endif
 
 void wxFontEnumeratorHelper::DoEnumerate()


@@ -129,7 +131,12 @@ void wxFontEnumeratorHelper::DoEnumerate()
                          (LPARAM)this, 0 /* reserved */) ;
 #else // Win16
     ::EnumFonts(hDC, (LPTSTR)NULL, (FONTENUMPROC)wxFontEnumeratorProc,
                          (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);
 #endif // Win32/16
 
     ::ReleaseDC(NULL, hDC);