X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/de6185e212ebc37ff11ff70278e3c4f68419b097..2c31fcd7308c02bcc19e97e9b30de1fd6e332806:/src/cocoa/fontutil.cpp diff --git a/src/cocoa/fontutil.cpp b/src/cocoa/fontutil.cpp index c50c724772..7d3eb844ae 100644 --- a/src/cocoa/fontutil.cpp +++ b/src/cocoa/fontutil.cpp @@ -6,7 +6,7 @@ // Created: 05.11.99 // RCS-ID: $Id$ // Copyright: (c) Vadim Zeitlin -// Licence: wxWindows license +// Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// // ============================================================================ @@ -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 @@ -248,9 +249,7 @@ bool wxFontModule::OnInit() void wxFontModule::OnExit() { - delete g_fontHash; - - g_fontHash = (wxHashTable *)NULL; + wxDELETE(g_fontHash); } #endif