Various fixes for various compilers...

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@4424 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Julian Smart
1999-11-07 18:34:36 +00:00
parent a968c19a82
commit 01dba85a7f
18 changed files with 268 additions and 128 deletions

View File

@@ -110,6 +110,12 @@ bool wxFontEnumeratorHelper::SetEncoding(wxFontEncoding encoding)
return TRUE;
}
#if defined(__GNUWIN32__) && !defined(__MINGW32__)
#define wxFONTENUMPROC int(*)(ENUMLOGFONTEX *, NEWTEXTMETRICEX*, int, LPARAM)
#else
#define wxFONTENUMPROC FONTENUMPROC
#endif
void wxFontEnumeratorHelper::DoEnumerate()
{
HDC hDC = ::GetDC(NULL);
@@ -119,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,