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

FontEnum fix: use NULL for global enumeration.

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37941 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Włodzimierz Skiba
2006-03-09 23:36:32 +00:00
parent 8a7fc9b5a7
commit c45c32033d
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/msw/fontenum.cpp
View File

@@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////////
// Name: msw/fontenum.cpp // Name: src/msw/fontenum.cpp
// Purpose: wxFontEnumerator class for Windows // Purpose: wxFontEnumerator class for Windows
// Author: Julian Smart // Author: Julian Smart
// Modified by: Vadim Zeitlin to add support for font encodings // Modified by: Vadim Zeitlin to add support for font encodings
@@ -158,8 +158,10 @@ void wxFontEnumeratorHelper::DoEnumerate()
HDC hDC = ::GetDC(NULL); HDC hDC = ::GetDC(NULL);
#ifdef __WXWINCE__ #ifdef __WXWINCE__
::EnumFontFamilies(hDC, m_facename, (wxFONTENUMPROC)wxFontEnumeratorProc, ::EnumFontFamilies(hDC,
(LPARAM)this) ; m_facename.empty() ? NULL : m_facename.c_str(),
(wxFONTENUMPROC)wxFontEnumeratorProc,
(LPARAM)this) ;
#else // __WIN32__ #else // __WIN32__
LOGFONT lf; LOGFONT lf;
lf.lfCharSet = (BYTE)m_charset; lf.lfCharSet = (BYTE)m_charset;