use ES_AUTOHSCROLL for multiline controls as well (fixes 966692)

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

diff --git a/src/msw/fontenum.cpp b/src/msw/fontenum.cpp
index 431c2eae92bfeeb683b033e0083904ed8088a2d9..7ee7852e0293d01673496f72a2c1f92ffda98ce5 100644 (file)
--- a/src/msw/fontenum.cpp
+++ b/src/msw/fontenum.cpp
@@ -17,7 +17,7 @@
 // headers
 // ----------------------------------------------------------------------------
 
 // headers
 // ----------------------------------------------------------------------------
 

-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)

     #pragma implementation "fontenum.h"
 #endif
 
     #pragma implementation "fontenum.h"
 #endif
 


@@ -28,16 +28,19 @@
   #pragma hdrstop
 #endif
 
   #pragma hdrstop
 #endif
 

+#if wxUSE_FONTMAP
+

 #ifndef WX_PRECOMP
 #ifndef WX_PRECOMP

-  #include "wx/font.h"
+    #include "wx/font.h"
+    #include "wx/encinfo.h"

 #endif
 
 #endif
 

+#include "wx/msw/private.h"
+

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

-#include "wx/msw/private.h"
-

 // ----------------------------------------------------------------------------
 // private classes
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // private classes
 // ----------------------------------------------------------------------------


@@ -85,14 +88,21 @@ private:
 
     // the list of charsets we already found while enumerating charsets
     wxArrayInt m_charsets;
 
     // the list of charsets we already found while enumerating charsets
     wxArrayInt m_charsets;

+
+    // the list of facenames we already found while enumerating facenames
+    wxArrayString m_facenames;
+
+    DECLARE_NO_COPY_CLASS(wxFontEnumeratorHelper)

 };
 
 // ----------------------------------------------------------------------------
 // private functions
 // ----------------------------------------------------------------------------
 
 };
 
 // ----------------------------------------------------------------------------
 // private functions
 // ----------------------------------------------------------------------------
 

+#ifndef __WXMICROWIN__

 int CALLBACK wxFontEnumeratorProc(LPLOGFONT lplf, LPTEXTMETRIC lptm,
                                   DWORD dwStyle, LONG lParam);
 int CALLBACK wxFontEnumeratorProc(LPLOGFONT lplf, LPTEXTMETRIC lptm,
                                   DWORD dwStyle, LONG lParam);

+#endif

 
 // ============================================================================
 // implementation
 
 // ============================================================================
 // implementation


@@ -118,53 +128,52 @@ void wxFontEnumeratorHelper::SetFamily(const wxString& family)
 
 bool wxFontEnumeratorHelper::SetEncoding(wxFontEncoding encoding)
 {
 
 bool wxFontEnumeratorHelper::SetEncoding(wxFontEncoding encoding)
 {

-    wxNativeEncodingInfo info;
-    if ( !wxGetNativeFontEncoding(encoding, &info) )
+    if ( encoding != wxFONTENCODING_SYSTEM )

     {
     {

-        if ( !wxTheFontMapper->GetAltForEncoding(encoding, &info) )
+        wxNativeEncodingInfo info;
+        if ( !wxGetNativeFontEncoding(encoding, &info) )

         {
         {

-            // no such encodings at all
-            return FALSE;
+#if wxUSE_FONTMAP
+            if ( !wxFontMapper::Get()->GetAltForEncoding(encoding, &info) )
+#endif // wxUSE_FONTMAP
+            {
+                // no such encodings at all
+                return FALSE;
+            }

         }
         }

+
+        m_charset = info.charset;
+        m_facename = info.facename;

     }
     }

-    m_charset = info.charset;
-    m_facename = info.facename;

 
     return TRUE;
 }
 
 
     return TRUE;
 }
 

-#if defined(__GNUWIN32__)
-    #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
 
 void wxFontEnumeratorHelper::DoEnumerate()
 {
 #else
     #define wxFONTENUMPROC FONTENUMPROC
 #endif
 
 void wxFontEnumeratorHelper::DoEnumerate()
 {

+#ifndef __WXMICROWIN__

     HDC hDC = ::GetDC(NULL);
 
     HDC hDC = ::GetDC(NULL);
 

-#ifdef __WIN32__
+#ifdef __WXWINCE__
+    ::EnumFontFamilies(hDC, m_facename, (wxFONTENUMPROC)wxFontEnumeratorProc,
+                         (LPARAM)this) ;
+#else // __WIN32__

     LOGFONT lf;
     lf.lfCharSet = m_charset;
     wxStrncpy(lf.lfFaceName, m_facename, WXSIZEOF(lf.lfFaceName));
     lf.lfPitchAndFamily = 0;
     ::EnumFontFamiliesEx(hDC, &lf, (wxFONTENUMPROC)wxFontEnumeratorProc,
                          (LPARAM)this, 0 /* reserved */) ;
     LOGFONT lf;
     lf.lfCharSet = 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);
 
     ::ReleaseDC(NULL, hDC);

+#endif

 }
 
 bool wxFontEnumeratorHelper::OnFont(const LPLOGFONT lf,
 }
 
 bool wxFontEnumeratorHelper::OnFont(const LPLOGFONT lf,


@@ -200,7 +209,7 @@ bool wxFontEnumeratorHelper::OnFont(const LPLOGFONT lf,
         }
     }
 
         }
     }
 

-    if ( m_charset != -1 )
+    if ( m_charset != DEFAULT_CHARSET )

     {
         // check that we have the right encoding
         if ( lf->lfCharSet != m_charset )
     {
         // check that we have the right encoding
         if ( lf->lfCharSet != m_charset )


@@ -208,6 +217,20 @@ bool wxFontEnumeratorHelper::OnFont(const LPLOGFONT lf,
             return TRUE;
         }
     }
             return TRUE;
         }
     }

+    else // enumerating fonts in all charsets
+    {
+        // we can get the same facename twice or more in this case because it
+        // may exist in several charsets but we only want to return one copy of
+        // it (note that this can't happen for m_charset != DEFAULT_CHARSET)
+        if ( m_facenames.Index(lf->lfFaceName) != wxNOT_FOUND )
+        {
+            // continue enumeration
+            return TRUE;
+        }
+
+        wxConstCast(this, wxFontEnumeratorHelper)->
+            m_facenames.Add(lf->lfFaceName);
+    }

 
     return m_fontEnum->OnFacename(lf->lfFaceName);
 }
 
     return m_fontEnum->OnFacename(lf->lfFaceName);
 }


@@ -244,18 +267,26 @@ bool wxFontEnumerator::EnumerateEncodings(const wxString& family)
 // Windows callbacks
 // ----------------------------------------------------------------------------
 
 // Windows callbacks
 // ----------------------------------------------------------------------------
 

+#ifndef __WXMICROWIN__

 int CALLBACK wxFontEnumeratorProc(LPLOGFONT lplf, LPTEXTMETRIC lptm,
 int CALLBACK wxFontEnumeratorProc(LPLOGFONT lplf, LPTEXTMETRIC lptm,

-                                  DWORD dwStyle, LONG lParam)
+                                  DWORD WXUNUSED(dwStyle), LONG lParam)

 {
 {

+
+    // we used to process TrueType fonts only, but there doesn't seem to be any
+    // reasons to restrict ourselves to them here
+#if 0

     // Get rid of any fonts that we don't want...
     if ( dwStyle != TRUETYPE_FONTTYPE )
     {
         // continue enumeration
         return TRUE;
     }
     // Get rid of any fonts that we don't want...
     if ( dwStyle != TRUETYPE_FONTTYPE )
     {
         // continue enumeration
         return TRUE;
     }

+#endif // 0

 
     wxFontEnumeratorHelper *fontEnum = (wxFontEnumeratorHelper *)lParam;
 
     return fontEnum->OnFont(lplf, lptm);
 }
 
     wxFontEnumeratorHelper *fontEnum = (wxFontEnumeratorHelper *)lParam;
 
     return fontEnum->OnFont(lplf, lptm);
 }

+#endif

 
 

+#endif // wxUSE_FONTMAP