From c45c32033d2b711fc62a2c3a85b500983c43ead0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?W=C5=82odzimierz=20Skiba?= Date: Thu, 9 Mar 2006 23:36:32 +0000 Subject: [PATCH] FontEnum fix: use NULL for global enumeration. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37941 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/msw/fontenum.cpp | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/msw/fontenum.cpp b/src/msw/fontenum.cpp index dda6ca6185..852ffea56d 100644 --- a/src/msw/fontenum.cpp +++ b/src/msw/fontenum.cpp @@ -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;