Applied patch [ 1374215 ] Bug fix to wxSpinCtrl for Windows

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

diff --git a/src/msw/fontenum.cpp b/src/msw/fontenum.cpp
index e92dde8150316163d6a5d297feeefbde15a2affd..dda6ca6185402ee203259660768831990ba19271 100644 (file)
--- a/src/msw/fontenum.cpp
+++ b/src/msw/fontenum.cpp
@@ -17,10 +17,6 @@
 // headers
 // ----------------------------------------------------------------------------
 
-#ifdef __GNUG__
-    #pragma implementation "fontenum.h"
-#endif
-
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
@@ -31,15 +27,17 @@
 #if wxUSE_FONTMAP
 
 #ifndef WX_PRECOMP
-  #include "wx/font.h"
+    #include "wx/gdicmn.h"
+    #include "wx/font.h"
+    #include "wx/encinfo.h"
 #endif
 
+#include "wx/msw/private.h"
+
 #include "wx/fontutil.h"
 #include "wx/fontenum.h"
 #include "wx/fontmap.h"
 
-#include "wx/msw/private.h"
-
 // ----------------------------------------------------------------------------
 // private classes
 // ----------------------------------------------------------------------------
@@ -79,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
@@ -115,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;
 }
 
@@ -137,7 +135,7 @@ bool wxFontEnumeratorHelper::SetEncoding(wxFontEncoding encoding)
 #endif // wxUSE_FONTMAP
             {
                 // no such encodings at all
-                return FALSE;
+                return false;
             }
         }
 
@@ -145,17 +143,11 @@ bool wxFontEnumeratorHelper::SetEncoding(wxFontEncoding encoding)
         m_facename = info.facename;
     }
 
-    return TRUE;
+    return true;
 }
 
-#if defined(__WXWINE__)
-    #define wxFONTENUMPROC FONTENUMPROCEX
-#elif (defined(__GNUWIN32__) && !defined(__CYGWIN10__) && !wxCHECK_W32API_VERSION( 1, 1 ))
-    #if wxUSE_NORLANDER_HEADERS
-        #define wxFONTENUMPROC int(*)(const LOGFONT *, const TEXTMETRIC *, long unsigned int, LPARAM)
-    #else
-        #define wxFONTENUMPROC int(*)(ENUMLOGFONTEX *, NEWTEXTMETRICEX*, int, LPARAM)
-    #endif
+#if defined(__GNUWIN32__) && !defined(__CYGWIN10__) && !wxCHECK_W32API_VERSION( 1, 1 ) && !wxUSE_NORLANDER_HEADERS
+    #define wxFONTENUMPROC int(*)(ENUMLOGFONTEX *, NEWTEXTMETRICEX*, int, LPARAM)
 #else
     #define wxFONTENUMPROC FONTENUMPROC
 #endif
@@ -165,22 +157,17 @@ void wxFontEnumeratorHelper::DoEnumerate()
 #ifndef __WXMICROWIN__
     HDC hDC = ::GetDC(NULL);
 
-#ifdef __WIN32__
+#ifdef __WXWINCE__
+    ::EnumFontFamilies(hDC, m_facename, (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,
                          (LPARAM)this, 0 /* reserved */) ;
-#else // Win16
-    ::EnumFonts(hDC, (LPTSTR)NULL, (FONTENUMPROC)wxFontEnumeratorProc,
-    #ifdef STRICT
-               (LPARAM)
-    #else
-               (LPSTR)
-    #endif
-               this);
-#endif // Win32/16
+#endif // Win32/CE
 
     ::ReleaseDC(NULL, hDC);
 #endif
@@ -204,7 +191,7 @@ bool wxFontEnumeratorHelper::OnFont(const LPLOGFONT lf,
         else
         {
             // continue enumeration
-            return TRUE;
+            return true;
         }
     }
 
@@ -215,7 +202,7 @@ bool wxFontEnumeratorHelper::OnFont(const LPLOGFONT lf,
         if ( tm->tmPitchAndFamily & TMPF_FIXED_PITCH )
         {
             // not a fixed pitch font
-            return TRUE;
+            return true;
         }
     }
 
@@ -224,7 +211,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
@@ -235,7 +222,7 @@ bool wxFontEnumeratorHelper::OnFont(const LPLOGFONT lf,
         if ( m_facenames.Index(lf->lfFaceName) != wxNOT_FOUND )
         {
             // continue enumeration
-            return TRUE;
+            return true;
         }
 
         wxConstCast(this, wxFontEnumeratorHelper)->
@@ -261,7 +248,7 @@ bool wxFontEnumerator::EnumerateFacenames(wxFontEncoding encoding,
     }
     // else: no such fonts, unknown encoding
 
-    return TRUE;
+    return true;
 }
 
 bool wxFontEnumerator::EnumerateEncodings(const wxString& family)
@@ -270,7 +257,7 @@ bool wxFontEnumerator::EnumerateEncodings(const wxString& family)
     fe.SetFamily(family);
     fe.DoEnumerate();
 
-    return TRUE;
+    return true;
 }
 
 // ----------------------------------------------------------------------------