Now allow SetMenuBar to be called several times.

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

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

-#if defined(__GNUWIN32__) && !defined(__MINGW32__)
-#define wxFONTENUMPROC int(*)(ENUMLOGFONTEX *, NEWTEXTMETRICEX*, int, LPARAM)
+#ifdef __GNUWIN32_OLD__
+    #define wxFONTENUMPROC int(*)(ENUMLOGFONTEX *, NEWTEXTMETRICEX*, int, LPARAM)

 #else
 #else

-#define wxFONTENUMPROC FONTENUMPROC
+    #define wxFONTENUMPROC FONTENUMPROC

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