include wx/wxchar.h after ctype.h to fix compilation problem with _T redefinition...

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

diff --git a/src/mgl/fontenum.cpp b/src/mgl/fontenum.cpp
index e7130181d508dc66734032dcc68f09d0e069afc7..ee847022d3b8753a41682da2ce85532fc1941fa5 100644 (file)
--- a/src/mgl/fontenum.cpp
+++ b/src/mgl/fontenum.cpp
@@ -3,7 +3,7 @@
 // Purpose:     wxFontEnumerator class for MGL
 // Author:      Vaclav Slavik
 // RCS-ID:      $Id$
 // Purpose:     wxFontEnumerator class for MGL
 // Author:      Vaclav Slavik
 // RCS-ID:      $Id$

-// Copyright:   (c) 2001 Vaclav Slavik
+// Copyright:   (c) 2001-2002 SciTech Software, Inc. (www.scitechsoft.com)

 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 


@@ -15,16 +15,24 @@
 // headers
 // ----------------------------------------------------------------------------
 
 // headers
 // ----------------------------------------------------------------------------
 

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

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

+// For compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"
+
+#ifdef __BORLANDC__
+    #pragma hdrstop
+#endif
+

 #include "wx/defs.h"
 #include "wx/dynarray.h"
 #include "wx/string.h"
 #include "wx/utils.h"
 
 #include "wx/fontenum.h"
 #include "wx/defs.h"
 #include "wx/dynarray.h"
 #include "wx/string.h"
 #include "wx/utils.h"
 
 #include "wx/fontenum.h"

+#include "wx/encinfo.h"

 #include "wx/fontutil.h"
 
 #include <mgraph.h>
 #include "wx/fontutil.h"
 
 #include <mgraph.h>