fixed small bug in operator=() (comparing equal but not identical objects were not...

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

diff --git a/src/msw/fontenum.cpp b/src/msw/fontenum.cpp
index 8ed53278ae36c7edc86ee71836c42b4766fd726c..68c3e999f8c55feaef9447199d8c0eb99f1edf18 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
 


@@ -31,15 +31,16 @@
 #if wxUSE_FONTMAP
 
 #ifndef WX_PRECOMP
 #if wxUSE_FONTMAP
 
 #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
 // ----------------------------------------------------------------------------


@@ -159,7 +160,10 @@ void wxFontEnumeratorHelper::DoEnumerate()
 #ifndef __WXMICROWIN__
     HDC hDC = ::GetDC(NULL);
 
 #ifndef __WXMICROWIN__
     HDC hDC = ::GetDC(NULL);
 

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

     LOGFONT lf;
     lf.lfCharSet = m_charset;
     wxStrncpy(lf.lfFaceName, m_facename, WXSIZEOF(lf.lfFaceName));
     LOGFONT lf;
     lf.lfCharSet = m_charset;
     wxStrncpy(lf.lfFaceName, m_facename, WXSIZEOF(lf.lfFaceName));