X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/32d4c30a13f65b7c8cb66f813a0b8c606ad8480b..78eecde0860f23a11932c53b1e59e41a6effd6bb:/src/cocoa/fontutil.cpp

diff --git a/src/cocoa/fontutil.cpp b/src/cocoa/fontutil.cpp
index dbb6d544aa..b42c8ebb3f 100644
--- a/src/cocoa/fontutil.cpp
+++ b/src/cocoa/fontutil.cpp
@@ -24,14 +24,16 @@
     #pragma hdrstop
 #endif
 
+#include "wx/fontutil.h"
+
 #ifndef WX_PRECOMP
     #include "wx/hash.h"
+    #include "wx/utils.h"
+    #include "wx/module.h"
 #endif // PCH
 
-#include "wx/fontutil.h"
 #include "wx/fontmap.h"
 #include "wx/tokenzr.h"
-#include "wx/module.h"
 #include "wx/encinfo.h"
 
 #ifdef __WXGTK20__
@@ -162,7 +164,6 @@ bool wxGetNativeFontEncoding(wxFontEncoding encoding,
         #pragma message enable nosimpint
     #endif
 
-    #include "wx/utils.h"       // for wxGetDisplay()
 #elif defined(__WXGTK__)
     // we have to declare struct tm to avoid problems with first forward
     // declaring it in C code (glib.h included from gdk.h does it) and then
@@ -178,7 +179,7 @@ bool wxGetNativeFontEncoding(wxFontEncoding encoding,
 // private data
 // ----------------------------------------------------------------------------
 
-static wxHashTable *g_fontHash = (wxHashTable*) NULL;
+static wxHashTable *g_fontHash = NULL;
 
 // ----------------------------------------------------------------------------
 // private functions
@@ -250,7 +251,7 @@ void wxFontModule::OnExit()
 {
     delete g_fontHash;
 
-    g_fontHash = (wxHashTable *)NULL;
+    g_fontHash = NULL;
 }
 
 #endif