Unix compilation fixed

[wxWidgets.git] / src / msw / fontenum.cpp

diff --git a/src/msw/fontenum.cpp b/src/msw/fontenum.cpp
index 1747efcaaf281aae971e88e2141e360f724c71bf..ca84524de7249b4d8f2e29b39d22bc3a72aabc4c 100644 (file)
--- a/src/msw/fontenum.cpp
+++ b/src/msw/fontenum.cpp
@@ -32,6 +32,7 @@
   #include "wx/font.h"
 #endif
 
   #include "wx/font.h"
 #endif
 

+#include "wx/fontutil.h"

 #include "wx/fontenum.h"
 #include "wx/fontmap.h"
 
 #include "wx/fontenum.h"
 #include "wx/fontmap.h"
 


@@ -104,7 +105,7 @@ int CALLBACK wxFontEnumeratorProc(LPLOGFONT lplf, LPTEXTMETRIC lptm,
 wxFontEnumeratorHelper::wxFontEnumeratorHelper(wxFontEnumerator *fontEnum)
 {
     m_fontEnum = fontEnum;
 wxFontEnumeratorHelper::wxFontEnumeratorHelper(wxFontEnumerator *fontEnum)
 {
     m_fontEnum = fontEnum;

-    m_charset = -1;
+    m_charset = DEFAULT_CHARSET;

     m_fixedOnly = FALSE;
     m_enumEncodings = FALSE;
 }
     m_fixedOnly = FALSE;
     m_enumEncodings = FALSE;
 }


@@ -178,7 +179,7 @@ bool wxFontEnumeratorHelper::OnFont(const LPLOGFONT lf,
             wxConstCast(this, wxFontEnumeratorHelper)->m_charsets.Add(cs);
 
             wxFontEncoding enc = wxGetFontEncFromCharSet(cs);
             wxConstCast(this, wxFontEnumeratorHelper)->m_charsets.Add(cs);
 
             wxFontEncoding enc = wxGetFontEncFromCharSet(cs);

-            return m_fontEnum->OnFontEncoding(m_family,
+            return m_fontEnum->OnFontEncoding(lf->lfFaceName,

                                               wxFontMapper::GetEncodingName(enc));
         }
         else
                                               wxFontMapper::GetEncodingName(enc));
         }
         else