No #if wxUSE_DRAG_AND_DROP around the wxMetafileDataObject class, so compilation...

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

diff --git a/src/msw/fontenum.cpp b/src/msw/fontenum.cpp
index 9d7e1820d03f22e2b29584dd4cabc25585c6a901..279f7be2aeb507a3649da892cc15154564c4a6be 100644 (file)
--- a/src/msw/fontenum.cpp
+++ b/src/msw/fontenum.cpp
@@ -110,10 +110,10 @@ bool wxFontEnumeratorHelper::SetEncoding(wxFontEncoding encoding)
     return TRUE;
 }
 
-// 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)
+#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