Various compilation fixes.

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

diff --git a/src/cocoa/fontutil.cpp b/src/cocoa/fontutil.cpp
index c50c724772cec1011b13818aba605b896d36cc68..b42c8ebb3f30bbc233f2261b853ba335e22429f6 100644 (file)
--- a/src/cocoa/fontutil.cpp
+++ b/src/cocoa/fontutil.cpp
@@ -24,15 +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__
@@ -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