Commit patch [ 1559950 ] fix mem leaks in wx{Dir|File}Dialog

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

diff --git a/src/cocoa/fontutil.cpp b/src/cocoa/fontutil.cpp
index dbb6d544aa20db844f3f3e3d58edc11357c07935..1a59d7e8e2393d7cff06beaf29e9d2d484f83103 100644 (file)
--- a/src/cocoa/fontutil.cpp
+++ b/src/cocoa/fontutil.cpp
@@ -24,14 +24,16 @@
     #pragma hdrstop
 #endif
 
     #pragma hdrstop
 #endif
 

+#include "wx/fontutil.h"
+

 #ifndef WX_PRECOMP
     #include "wx/hash.h"
 #ifndef WX_PRECOMP
     #include "wx/hash.h"

+    #include "wx/utils.h"
+    #include "wx/module.h"

 #endif // PCH
 
 #endif // PCH
 

-#include "wx/fontutil.h"

 #include "wx/fontmap.h"
 #include "wx/tokenzr.h"
 #include "wx/fontmap.h"
 #include "wx/tokenzr.h"

-#include "wx/module.h"

 #include "wx/encinfo.h"
 
 #ifdef __WXGTK20__
 #include "wx/encinfo.h"
 
 #ifdef __WXGTK20__


@@ -162,7 +164,6 @@ bool wxGetNativeFontEncoding(wxFontEncoding encoding,
         #pragma message enable nosimpint
     #endif
 
         #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
 #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