correcting condition: only interfere in the non-native case

[wxWidgets.git] / src / mac / carbon / fontenum.cpp

diff --git a/src/mac/carbon/fontenum.cpp b/src/mac/carbon/fontenum.cpp
index 5e9987348e33f3f5c06115e5ef5d2b2903622ea4..ea743eee90ab62aefcd8265724d3158758412c6d 100644 (file)
--- a/src/mac/carbon/fontenum.cpp
+++ b/src/mac/carbon/fontenum.cpp
@@ -17,13 +17,15 @@
 // headers
 // ----------------------------------------------------------------------------
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
     #pragma implementation "fontenum.h"
 #endif
 
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
+#if wxUSE_FONTMAP
+
 #ifdef __BORLANDC__
   #pragma hdrstop
 #endif
@@ -36,6 +38,7 @@
 #include "wx/fontutil.h"
 #include "wx/fontmap.h"
 #include "wx/fontutil.h"
+#include "wx/encinfo.h"
 
 #include "wx/mac/private.h"
 
@@ -170,3 +173,5 @@ bool wxFontEnumerator::EnumerateEncodings(const wxString& family)
 
     return TRUE;
 }
+
+#endif