fixes for icon-inherits-from-bitmap mode

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

diff --git a/src/msw/fontenum.cpp b/src/msw/fontenum.cpp
index 33b5a192d8e318c04b0c0750d6268ee9a355d6b9..7021de27dcf2937dd56c30346eb242c9ebf1f128 100644 (file)
--- a/src/msw/fontenum.cpp
+++ b/src/msw/fontenum.cpp
@@ -103,14 +103,19 @@ bool wxFontEnumeratorHelper::SetEncoding(wxFontEncoding encoding)
             // no such encodings at all
             return FALSE;
         }
-
-        m_charset = info.charset;
-        m_facename = info.facename;
     }
+    m_charset = info.charset;
+    m_facename = info.facename;
 
     return TRUE;
 }
 
+#ifdef __GNUWIN32_OLD__
+    #define wxFONTENUMPROC int(*)(ENUMLOGFONTEX *, NEWTEXTMETRICEX*, int, LPARAM)
+#else
+    #define wxFONTENUMPROC FONTENUMPROC
+#endif
+
 void wxFontEnumeratorHelper::DoEnumerate()
 {
     HDC hDC = ::GetDC(NULL);
@@ -120,7 +125,7 @@ void wxFontEnumeratorHelper::DoEnumerate()
     lf.lfCharSet = m_charset;
     wxStrncpy(lf.lfFaceName, m_facename, WXSIZEOF(lf.lfFaceName));
     lf.lfPitchAndFamily = 0;
-    ::EnumFontFamiliesEx(hDC, &lf, (FONTENUMPROC)wxFontEnumeratorProc,
+    ::EnumFontFamiliesEx(hDC, &lf, (wxFONTENUMPROC)wxFontEnumeratorProc,
                          (LPARAM)this, 0 /* reserved */) ;
 #else // Win16
     ::EnumFonts(hDC, (LPTSTR)NULL, (FONTENUMPROC)wxFontEnumeratorProc,