X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/03647350fc7cd141953c72e0284e928847d30f44..dbd92d3d0cc40e96cdde8a67b573856b8aa47bcb:/src/unix/fontutil.cpp?ds=inline

diff --git a/src/unix/fontutil.cpp b/src/unix/fontutil.cpp
index aa47c514c4..39554c0fff 100644
--- a/src/unix/fontutil.cpp
+++ b/src/unix/fontutil.cpp
@@ -53,8 +53,8 @@
     #include "wx/x11/private.h"
     #include "wx/gtk/private/string.h"
 
-    #define wxPANGO_CONV(s) (wxConvUTF8.cWX2MB((s)))
-    #define wxPANGO_CONV_BACK(s) (wxConvUTF8.cMB2WX((s)))
+    #define wxPANGO_CONV(s) s.utf8_str()
+    #define wxPANGO_CONV_BACK(s) wxString::FromUTF8Unchecked(s)
 #endif
 
 // ----------------------------------------------------------------------------
@@ -1465,9 +1465,7 @@ bool wxFontModule::OnInit()
 
 void wxFontModule::OnExit()
 {
-    delete g_fontHash;
-
-    g_fontHash = NULL;
+    wxDELETE(g_fontHash);
 }
 
 #endif // GTK 2.0/1.x