FontEnum fix: use NULL for global enumeration.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37941 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
parent
8a7fc9b5a7
commit
c45c32033d
@ -1,5 +1,5 @@
|
||||
///////////////////////////////////////////////////////////////////////////////
|
||||
// Name: msw/fontenum.cpp
|
||||
// Name: src/msw/fontenum.cpp
|
||||
// Purpose: wxFontEnumerator class for Windows
|
||||
// Author: Julian Smart
|
||||
// Modified by: Vadim Zeitlin to add support for font encodings
|
||||
@ -158,8 +158,10 @@ void wxFontEnumeratorHelper::DoEnumerate()
|
||||
HDC hDC = ::GetDC(NULL);
|
||||
|
||||
#ifdef __WXWINCE__
|
||||
::EnumFontFamilies(hDC, m_facename, (wxFONTENUMPROC)wxFontEnumeratorProc,
|
||||
(LPARAM)this) ;
|
||||
::EnumFontFamilies(hDC,
|
||||
m_facename.empty() ? NULL : m_facename.c_str(),
|
||||
(wxFONTENUMPROC)wxFontEnumeratorProc,
|
||||
(LPARAM)this) ;
|
||||
#else // __WIN32__
|
||||
LOGFONT lf;
|
||||
lf.lfCharSet = (BYTE)m_charset;
|
||||
|
Loading…
Reference in New Issue
Block a user