adaption for CW 8.3 and quick hack for unicode text control size

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

diff --git a/src/mgl/fontutil.cpp b/src/mgl/fontutil.cpp
index 2475cced8ffb70bbae001733cf365ca8a76f4586..7900bda0ec9d5671a962815bc4c57415cf5ac6a4 100644 (file)
--- a/src/mgl/fontutil.cpp
+++ b/src/mgl/fontutil.cpp
@@ -9,7 +9,7 @@
 /////////////////////////////////////////////////////////////////////////////
 
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
     #pragma implementation "fontutil.h"
 #endif
 
@@ -20,14 +20,12 @@
     #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"