Remove checks for ancient gcc/MinGW versions.
Don't test for wxUSE_NORLANDER_HEADERS, this is always true since many, many years. Remove tests for gcc version < 3.3, notably 2.95: the minimal supported gcc version is 3.4. Closes #15727. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@76549 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -146,12 +146,6 @@ bool wxFontEnumeratorHelper::SetEncoding(wxFontEncoding encoding)
|
||||
return true;
|
||||
}
|
||||
|
||||
#if defined(__GNUWIN32__) && !defined(__CYGWIN10__) && !wxCHECK_W32API_VERSION( 1, 1 ) && !wxUSE_NORLANDER_HEADERS
|
||||
#define wxFONTENUMPROC int(*)(ENUMLOGFONTEX *, NEWTEXTMETRICEX*, int, LPARAM)
|
||||
#else
|
||||
#define wxFONTENUMPROC FONTENUMPROC
|
||||
#endif
|
||||
|
||||
void wxFontEnumeratorHelper::DoEnumerate()
|
||||
{
|
||||
#ifndef __WXMICROWIN__
|
||||
@@ -160,14 +154,14 @@ void wxFontEnumeratorHelper::DoEnumerate()
|
||||
#ifdef __WXWINCE__
|
||||
::EnumFontFamilies(hDC,
|
||||
m_facename.empty() ? NULL : wxMSW_CONV_LPCTSTR(m_facename),
|
||||
(wxFONTENUMPROC)wxFontEnumeratorProc,
|
||||
(FONTENUMPROC)wxFontEnumeratorProc,
|
||||
(LPARAM)this) ;
|
||||
#else // __WIN32__
|
||||
LOGFONT lf;
|
||||
lf.lfCharSet = (BYTE)m_charset;
|
||||
wxStrlcpy(lf.lfFaceName, m_facename.c_str(), WXSIZEOF(lf.lfFaceName));
|
||||
lf.lfPitchAndFamily = 0;
|
||||
::EnumFontFamiliesEx(hDC, &lf, (wxFONTENUMPROC)wxFontEnumeratorProc,
|
||||
::EnumFontFamiliesEx(hDC, &lf, (FONTENUMPROC)wxFontEnumeratorProc,
|
||||
(LPARAM)this, 0 /* reserved */) ;
|
||||
#endif // Win32/CE
|
||||
|
||||
|
Reference in New Issue
Block a user