Removed all duplicated and complicated #ifdefs for enabling Skip and Abort in progres...

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

diff --git a/src/mgl/fontutil.cpp b/src/mgl/fontutil.cpp
index f73a6fb862805d7bf55c94089680fef05d1d23a5..7900bda0ec9d5671a962815bc4c57415cf5ac6a4 100644 (file)
--- a/src/mgl/fontutil.cpp
+++ b/src/mgl/fontutil.cpp
@@ -5,11 +5,11 @@
 // Created:     2001/04/29
 // RCS-ID:      $Id$
 // Copyright:   (c) 2001-2002 SciTech Software, Inc. (www.scitechsoft.com)
 // Created:     2001/04/29
 // RCS-ID:      $Id$
 // Copyright:   (c) 2001-2002 SciTech Software, Inc. (www.scitechsoft.com)

-// Licence:     wxWindows license
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 
 /////////////////////////////////////////////////////////////////////////////
 
 

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

     #pragma implementation "fontutil.h"
 #endif
 
     #pragma implementation "fontutil.h"
 #endif
 


@@ -20,14 +20,12 @@
     #pragma hdrstop
 #endif
 
     #pragma hdrstop
 #endif
 

-#ifndef WX_PRECOMP
-    #include "wx/log.h"
-    #include "wx/fontutil.h"
-    #include "wx/fontmap.h"
-    #include "wx/tokenzr.h"
-    #include "wx/hash.h"
-#endif // PCH
-
+#include "wx/log.h"
+#include "wx/fontutil.h"
+#include "wx/encinfo.h"
+#include "wx/fontmap.h"
+#include "wx/tokenzr.h"
+#include "wx/hash.h"

 
 #include "wx/listimpl.cpp"
 #include "wx/sysopt.h"
 
 #include "wx/listimpl.cpp"
 #include "wx/sysopt.h"