Avoid an assert when m_dir is empty

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

diff --git a/src/msw/fontenum.cpp b/src/msw/fontenum.cpp
index cc320215b80f4615e4379b8b7f15522be17c3a39..f540cf64be3c75d559c58d6c7a985c33cbb37ff1 100644 (file)
--- 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
 // Purpose:     wxFontEnumerator class for Windows
 // Author:      Julian Smart
 // Modified by: Vadim Zeitlin to add support for font encodings


@@ -17,10 +17,6 @@
 // headers
 // ----------------------------------------------------------------------------
 
 // 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"
 
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 


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

-#if wxUSE_FONTMAP
+#if wxUSE_FONTENUM
+
+#include "wx/fontenum.h"

 
 #ifndef WX_PRECOMP
 
 #ifndef WX_PRECOMP

-  #include "wx/font.h"
+    #include "wx/gdicmn.h"
+    #include "wx/font.h"
+    #include "wx/dynarray.h"
+    #include "wx/msw/private.h"

 #endif
 
 #endif
 

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

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

-#include "wx/fontenum.h"

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


@@ -79,10 +78,10 @@ private:
     // if not empty, enum only the fonts in this family
     wxString m_family;
 
     // 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;
 
     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
     bool m_enumEncodings;
 
     // the list of charsets we already found while enumerating charsets


@@ -91,7 +90,7 @@ private:
     // the list of facenames we already found while enumerating facenames
     wxArrayString m_facenames;
 
     // the list of facenames we already found while enumerating facenames
     wxArrayString m_facenames;
 

-    DECLARE_NO_COPY_CLASS(wxFontEnumeratorHelper)
+    wxDECLARE_NO_COPY_CLASS(wxFontEnumeratorHelper);

 };
 
 // ----------------------------------------------------------------------------
 };
 
 // ----------------------------------------------------------------------------


@@ -100,7 +99,7 @@ private:
 
 #ifndef __WXMICROWIN__
 int CALLBACK wxFontEnumeratorProc(LPLOGFONT lplf, LPTEXTMETRIC lptm,
 
 #ifndef __WXMICROWIN__
 int CALLBACK wxFontEnumeratorProc(LPLOGFONT lplf, LPTEXTMETRIC lptm,

-                                  DWORD dwStyle, LONG lParam);
+                                  DWORD dwStyle, LPARAM lParam);

 #endif
 
 // ============================================================================
 #endif
 
 // ============================================================================


@@ -115,13 +114,13 @@ wxFontEnumeratorHelper::wxFontEnumeratorHelper(wxFontEnumerator *fontEnum)
 {
     m_fontEnum = fontEnum;
     m_charset = DEFAULT_CHARSET;
 {
     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)
 {
 }
 
 void wxFontEnumeratorHelper::SetFamily(const wxString& family)
 {

-    m_enumEncodings = TRUE;
+    m_enumEncodings = true;

     m_family = family;
 }
 
     m_family = family;
 }
 


@@ -137,7 +136,7 @@ bool wxFontEnumeratorHelper::SetEncoding(wxFontEncoding encoding)
 #endif // wxUSE_FONTMAP
             {
                 // no such encodings at all
 #endif // wxUSE_FONTMAP
             {
                 // no such encodings at all

-                return FALSE;
+                return false;

             }
         }
 
             }
         }
 


@@ -145,7 +144,7 @@ bool wxFontEnumeratorHelper::SetEncoding(wxFontEncoding encoding)
         m_facename = info.facename;
     }
 
         m_facename = info.facename;
     }
 

-    return TRUE;
+    return true;

 }
 
 #if defined(__GNUWIN32__) && !defined(__CYGWIN10__) && !wxCHECK_W32API_VERSION( 1, 1 ) && !wxUSE_NORLANDER_HEADERS
 }
 
 #if defined(__GNUWIN32__) && !defined(__CYGWIN10__) && !wxCHECK_W32API_VERSION( 1, 1 ) && !wxUSE_NORLANDER_HEADERS


@@ -160,24 +159,18 @@ void wxFontEnumeratorHelper::DoEnumerate()
     HDC hDC = ::GetDC(NULL);
 
 #ifdef __WXWINCE__
     HDC hDC = ::GetDC(NULL);
 
 #ifdef __WXWINCE__

-    ::EnumFontFamilies(hDC, m_facename, (wxFONTENUMPROC)wxFontEnumeratorProc,
-                         (LPARAM)this) ;
-#elif defined(__WIN32__)
+    ::EnumFontFamilies(hDC,
+                       m_facename.empty() ? NULL : m_facename.wx_str(),
+                       (wxFONTENUMPROC)wxFontEnumeratorProc,
+                       (LPARAM)this) ;
+#else // __WIN32__

     LOGFONT lf;
     LOGFONT lf;

-    lf.lfCharSet = m_charset;
-    wxStrncpy(lf.lfFaceName, m_facename, WXSIZEOF(lf.lfFaceName));
+    lf.lfCharSet = (BYTE)m_charset;
+    wxStrlcpy(lf.lfFaceName, m_facename.c_str(), WXSIZEOF(lf.lfFaceName));

     lf.lfPitchAndFamily = 0;
     ::EnumFontFamiliesEx(hDC, &lf, (wxFONTENUMPROC)wxFontEnumeratorProc,
                          (LPARAM)this, 0 /* reserved */) ;
     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
 
     ::ReleaseDC(NULL, hDC);
 #endif


@@ -201,7 +194,7 @@ bool wxFontEnumeratorHelper::OnFont(const LPLOGFONT lf,
         else
         {
             // continue enumeration
         else
         {
             // continue enumeration

-            return TRUE;
+            return true;

         }
     }
 
         }
     }
 


@@ -212,7 +205,7 @@ bool wxFontEnumeratorHelper::OnFont(const LPLOGFONT lf,
         if ( tm->tmPitchAndFamily & TMPF_FIXED_PITCH )
         {
             // not a fixed pitch font
         if ( tm->tmPitchAndFamily & TMPF_FIXED_PITCH )
         {
             // not a fixed pitch font

-            return TRUE;
+            return true;

         }
     }
 
         }
     }
 


@@ -221,7 +214,7 @@ bool wxFontEnumeratorHelper::OnFont(const LPLOGFONT lf,
         // check that we have the right encoding
         if ( lf->lfCharSet != m_charset )
         {
         // check that we have the right encoding
         if ( lf->lfCharSet != m_charset )
         {

-            return TRUE;
+            return true;

         }
     }
     else // enumerating fonts in all charsets
         }
     }
     else // enumerating fonts in all charsets


@@ -232,7 +225,7 @@ bool wxFontEnumeratorHelper::OnFont(const LPLOGFONT lf,
         if ( m_facenames.Index(lf->lfFaceName) != wxNOT_FOUND )
         {
             // continue enumeration
         if ( m_facenames.Index(lf->lfFaceName) != wxNOT_FOUND )
         {
             // continue enumeration

-            return TRUE;
+            return true;

         }
 
         wxConstCast(this, wxFontEnumeratorHelper)->
         }
 
         wxConstCast(this, wxFontEnumeratorHelper)->


@@ -258,7 +251,7 @@ bool wxFontEnumerator::EnumerateFacenames(wxFontEncoding encoding,
     }
     // else: no such fonts, unknown encoding
 
     }
     // else: no such fonts, unknown encoding
 

-    return TRUE;
+    return true;

 }
 
 bool wxFontEnumerator::EnumerateEncodings(const wxString& family)
 }
 
 bool wxFontEnumerator::EnumerateEncodings(const wxString& family)


@@ -267,7 +260,7 @@ bool wxFontEnumerator::EnumerateEncodings(const wxString& family)
     fe.SetFamily(family);
     fe.DoEnumerate();
 
     fe.SetFamily(family);
     fe.DoEnumerate();
 

-    return TRUE;
+    return true;

 }
 
 // ----------------------------------------------------------------------------
 }
 
 // ----------------------------------------------------------------------------


@@ -276,7 +269,7 @@ bool wxFontEnumerator::EnumerateEncodings(const wxString& family)
 
 #ifndef __WXMICROWIN__
 int CALLBACK wxFontEnumeratorProc(LPLOGFONT lplf, LPTEXTMETRIC lptm,
 
 #ifndef __WXMICROWIN__
 int CALLBACK wxFontEnumeratorProc(LPLOGFONT lplf, LPTEXTMETRIC lptm,

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

 {
 
     // we used to process TrueType fonts only, but there doesn't seem to be any
 {
 
     // we used to process TrueType fonts only, but there doesn't seem to be any


@@ -296,4 +289,4 @@ int CALLBACK wxFontEnumeratorProc(LPLOGFONT lplf, LPTEXTMETRIC lptm,
 }
 #endif
 
 }
 #endif
 

-#endif // wxUSE_FONTMAP
+#endif // wxUSE_FONTENUM