Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove redundant tests for __WIN32__ in wxMSW code.

Browse Source 
This is always defined, Win16 is not supported since ages and Win64 defines
both __WIN32__ and __WIN64__.
This commit is contained in:
Vadim Zeitlin
2015-06-30 18:55:30 +02:00
parent d421373c2e
commit 30b523d1f2
24 changed files with 17 additions and 164 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/msw/fontenum.cpp
View File

@@ -156,14 +156,14 @@ void wxFontEnumeratorHelper::DoEnumerate()
m_facename.empty() ? NULL : wxMSW_CONV_LPCTSTR(m_facename),
(FONTENUMPROC)wxFontEnumeratorProc,
(LPARAM)this) ;
#else // __WIN32__
#else // !__WXWINCE__
LOGFONT lf;
lf.lfCharSet = (BYTE)m_charset;
wxStrlcpy(lf.lfFaceName, m_facename.c_str(), WXSIZEOF(lf.lfFaceName));
lf.lfPitchAndFamily = 0;
::EnumFontFamiliesEx(hDC, &lf, (FONTENUMPROC)wxFontEnumeratorProc,
(LPARAM)this, 0 /* reserved */) ;
#endif // Win32/CE
#endif // WinCE/!WinCE
::ReleaseDC(NULL, hDC);
#endif