X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/3a5bcc4db0851bf8cd3063917511b0b17c7f9679..9f93b45e59e93e17850bbc37a8960240072bc1c0:/src/msw/fontenum.cpp

diff --git a/src/msw/fontenum.cpp b/src/msw/fontenum.cpp
index 7ee7852e02..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
@@ -17,10 +17,6 @@
 // headers
 // ----------------------------------------------------------------------------
 
-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-    #pragma implementation "fontenum.h"
-#endif
-
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
@@ -31,6 +27,7 @@
 #if wxUSE_FONTMAP
 
 #ifndef WX_PRECOMP
+    #include "wx/gdicmn.h"
     #include "wx/font.h"
     #include "wx/encinfo.h"
 #endif
@@ -80,10 +77,10 @@ private:
     // if not empty, enum only the fonts in this family
     wxString m_family;
 
-    // if TRUE, enum only fixed fonts
+    // if true, enum only fixed fonts
     bool m_fixedOnly;
 
-    // if TRUE, we enumerate the encodings, not fonts
+    // if true, we enumerate the encodings, not fonts
     bool m_enumEncodings;
 
     // the list of charsets we already found while enumerating charsets
@@ -116,13 +113,13 @@ wxFontEnumeratorHelper::wxFontEnumeratorHelper(wxFontEnumerator *fontEnum)
 {
     m_fontEnum = fontEnum;
     m_charset = DEFAULT_CHARSET;
-    m_fixedOnly = FALSE;
-    m_enumEncodings = FALSE;
+    m_fixedOnly = false;
+    m_enumEncodings = false;
 }
 
 void wxFontEnumeratorHelper::SetFamily(const wxString& family)
 {
-    m_enumEncodings = TRUE;
+    m_enumEncodings = true;
     m_family = family;
 }
 
@@ -138,7 +135,7 @@ bool wxFontEnumeratorHelper::SetEncoding(wxFontEncoding encoding)
 #endif // wxUSE_FONTMAP
             {
                 // no such encodings at all
-                return FALSE;
+                return false;
             }
         }
 
@@ -146,7 +143,7 @@ bool wxFontEnumeratorHelper::SetEncoding(wxFontEncoding encoding)
         m_facename = info.facename;
     }
 
-    return TRUE;
+    return true;
 }
 
 #if defined(__GNUWIN32__) && !defined(__CYGWIN10__) && !wxCHECK_W32API_VERSION( 1, 1 ) && !wxUSE_NORLANDER_HEADERS
@@ -161,11 +158,13 @@ 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 = m_charset;
+    lf.lfCharSet = (BYTE)m_charset;
     wxStrncpy(lf.lfFaceName, m_facename, WXSIZEOF(lf.lfFaceName));
     lf.lfPitchAndFamily = 0;
     ::EnumFontFamiliesEx(hDC, &lf, (wxFONTENUMPROC)wxFontEnumeratorProc,
@@ -194,7 +193,7 @@ bool wxFontEnumeratorHelper::OnFont(const LPLOGFONT lf,
         else
         {
             // continue enumeration
-            return TRUE;
+            return true;
         }
     }
 
@@ -205,7 +204,7 @@ bool wxFontEnumeratorHelper::OnFont(const LPLOGFONT lf,
         if ( tm->tmPitchAndFamily & TMPF_FIXED_PITCH )
         {
             // not a fixed pitch font
-            return TRUE;
+            return true;
         }
     }
 
@@ -214,7 +213,7 @@ bool wxFontEnumeratorHelper::OnFont(const LPLOGFONT lf,
         // check that we have the right encoding
         if ( lf->lfCharSet != m_charset )
         {
-            return TRUE;
+            return true;
         }
     }
     else // enumerating fonts in all charsets
@@ -225,7 +224,7 @@ bool wxFontEnumeratorHelper::OnFont(const LPLOGFONT lf,
         if ( m_facenames.Index(lf->lfFaceName) != wxNOT_FOUND )
         {
             // continue enumeration
-            return TRUE;
+            return true;
         }
 
         wxConstCast(this, wxFontEnumeratorHelper)->
@@ -251,7 +250,7 @@ bool wxFontEnumerator::EnumerateFacenames(wxFontEncoding encoding,
     }
     // else: no such fonts, unknown encoding
 
-    return TRUE;
+    return true;
 }
 
 bool wxFontEnumerator::EnumerateEncodings(const wxString& family)
@@ -260,7 +259,7 @@ bool wxFontEnumerator::EnumerateEncodings(const wxString& family)
     fe.SetFamily(family);
     fe.DoEnumerate();
 
-    return TRUE;
+    return true;
 }
 
 // ----------------------------------------------------------------------------