X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/09fcd88955f6460d1f0d3d506118ce52c1090621..51dc95a4c8ccb00741be48f6353749ada3e9f39a:/src/gtk/font.cpp

diff --git a/src/gtk/font.cpp b/src/gtk/font.cpp
index 22c761e6fc..74864d1882 100644
--- a/src/gtk/font.cpp
+++ b/src/gtk/font.cpp
@@ -162,18 +162,18 @@ bool wxNativeFontInfo::FromString(const wxString& s)
     xFontName = tokenizer.GetNextToken();
     if(!xFontName)
         return FALSE;
-        
+
     return TRUE;
 }
 
 wxString wxNativeFontInfo::ToString() const
 {
     wxString s;
-    
-    s.Printf("%d;%s", 
+
+    s.Printf(_T("%d;%s"),
              0,                         // version
              xFontName.c_str());
-             
+
     return s;
 }
 
@@ -185,8 +185,6 @@ IMPLEMENT_DYNAMIC_CLASS(wxFont, wxGDIObject)
 
 void wxFont::Init()
 {
-    if (wxTheFontList)
-        wxTheFontList->Append( this );
 }
 
 wxFont::wxFont(const wxNativeFontInfo& info)
@@ -334,8 +332,6 @@ void wxFont::Unshare()
 
 wxFont::~wxFont()
 {
-    if (wxTheFontList)
-        wxTheFontList->DeleteObject( this );
 }
 
 // ----------------------------------------------------------------------------
@@ -493,6 +489,12 @@ GdkFont *GtkGetDefaultGuiFont()
         }
         gtk_widget_destroy( widget );
     }
+    else
+    {
+        // already have it, but ref it once more before returning
+        gdk_font_ref(g_systemDefaultGuiFont);
+    }
+
     return g_systemDefaultGuiFont;
 }