// headers
// ----------------------------------------------------------------------------
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
#pragma implementation "fontenum.h"
#endif
#if wxUSE_FONTMAP
#ifndef WX_PRECOMP
- #include "wx/font.h"
+ #include "wx/font.h"
+ #include "wx/encinfo.h"
#endif
#include "wx/msw/private.h"
#ifdef __WXWINCE__
::EnumFontFamilies(hDC, m_facename, (wxFONTENUMPROC)wxFontEnumeratorProc,
(LPARAM)this) ;
-#elif defined(__WIN32__)
+#else // __WIN32__
LOGFONT lf;
lf.lfCharSet = m_charset;
wxStrncpy(lf.lfFaceName, m_facename, WXSIZEOF(lf.lfFaceName));
lf.lfPitchAndFamily = 0;
::EnumFontFamiliesEx(hDC, &lf, (wxFONTENUMPROC)wxFontEnumeratorProc,
(LPARAM)this, 0 /* reserved */) ;
-#else // Win16
- ::EnumFonts(hDC, (LPTSTR)NULL, (FONTENUMPROC)wxFontEnumeratorProc,
- #ifdef STRICT
- (LPARAM)
- #else
- (LPSTR)
- #endif
- this);
-#endif // Win32/16
+#endif // Win32/CE
::ReleaseDC(NULL, hDC);
#endif