X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/77ffb5937e89927b621128789401db8921fe580f..6f026b5b63fe7ccb025e84509886f74772b9df13:/src/cocoa/fontutil.cpp?ds=sidebyside

diff --git a/src/cocoa/fontutil.cpp b/src/cocoa/fontutil.cpp
index 00f870306c..6dad697b93 100644
--- a/src/cocoa/fontutil.cpp
+++ b/src/cocoa/fontutil.cpp
@@ -1,12 +1,11 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        unix/fontutil.cpp
+// Name:        src/cocoa/fontutil.cpp
 // Purpose:     Font helper functions for X11 (GDK/X)
 // Author:      Vadim Zeitlin
 // Modified by:
 // Created:     05.11.99
-// RCS-ID:      $Id$
 // Copyright:   (c) Vadim Zeitlin
-// Licence:     wxWidgets license
+// Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================
@@ -17,10 +16,6 @@
 // headers
 // ----------------------------------------------------------------------------
 
-#ifdef __GNUG__
-    #pragma implementation "fontutil.h"
-#endif
-
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
@@ -28,14 +23,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/hash.h"
-#include "wx/module.h"
 #include "wx/encinfo.h"
 
 #ifdef __WXGTK20__
@@ -72,7 +69,7 @@ wxFontStyle wxNativeFontInfo::GetStyle() const
             m_style = wxFONTSTYLE_SLANT;
             break;
     }
-    
+
     return m_style;
 }
 
@@ -101,19 +98,19 @@ wxFontWeight wxNativeFontInfo::GetWeight() const
             m_weight = wxFONTWEIGHT_BOLD;
             break;
     }
-    
+
     return m_weight;
 }
 
 bool wxNativeFontInfo::GetUnderlined() const
 {
-    return FALSE;
+    return false;
 }
 
 wxString wxNativeFontInfo::GetFaceName() const
 {
     wxString tmp = wxGTK_CONV_BACK( pango_font_description_get_family( description ) );
-    
+
     return tmp;
 }
 
@@ -133,7 +130,7 @@ wxFontEncoding wxNativeFontInfo::GetEncoding() const
 
 bool wxNativeEncodingInfo::FromString(const wxString& s)
 {
-    return FALSE;
+    return false;
 }
 
 wxString wxNativeEncodingInfo::ToString() const
@@ -143,16 +140,16 @@ wxString wxNativeEncodingInfo::ToString() const
 
 bool wxTestFontEncoding(const wxNativeEncodingInfo& info)
 {
-    return TRUE;
+    return true;
 }
 
 bool wxGetNativeFontEncoding(wxFontEncoding encoding,
                              wxNativeEncodingInfo *info)
 {
-    return FALSE;
+    return false;
 }
 
-#else 
+#else
    // __WXGTK20__
 
 #ifdef __X__
@@ -166,7 +163,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
@@ -182,7 +178,7 @@ bool wxGetNativeFontEncoding(wxFontEncoding encoding,
 // private data
 // ----------------------------------------------------------------------------
 
-static wxHashTable *g_fontHash = (wxHashTable*) NULL;
+static wxHashTable *g_fontHash = NULL;
 
 // ----------------------------------------------------------------------------
 // private functions
@@ -215,7 +211,7 @@ return wxEmptyString;
 bool wxGetNativeFontEncoding(wxFontEncoding encoding,
                              wxNativeEncodingInfo *info)
 {
-    return FALSE;
+    return false;
 }
 
 bool wxTestFontEncoding(const wxNativeEncodingInfo& info)
@@ -247,14 +243,12 @@ bool wxFontModule::OnInit()
 {
     g_fontHash = new wxHashTable( wxKEY_STRING );
 
-    return TRUE;
+    return true;
 }
 
 void wxFontModule::OnExit()
 {
-    delete g_fontHash;
-
-    g_fontHash = (wxHashTable *)NULL;
+    wxDELETE(g_fontHash);
 }
 
 #endif