removed rpmfiles.lst

[wxWidgets.git] / src / gtk / font.cpp

diff --git a/src/gtk/font.cpp b/src/gtk/font.cpp
index 1da01a2ed06703f39d210b8fafc7a90524da35fc..74864d18822b5334d479230c011e47b3c6723592 100644 (file)
--- 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;
     xFontName = tokenizer.GetNextToken();
     if(!xFontName)
         return FALSE;

-        
+

     return TRUE;
 }
 
 wxString wxNativeFontInfo::ToString() const
 {
     wxString s;
     return TRUE;
 }
 
 wxString wxNativeFontInfo::ToString() const
 {
     wxString s;

-    
+

     s.Printf(_T("%d;%s"),
              0,                         // version
              xFontName.c_str());
     s.Printf(_T("%d;%s"),
              0,                         // version
              xFontName.c_str());

-             
+

     return s;
 }
 
     return s;
 }
 


@@ -185,8 +185,6 @@ IMPLEMENT_DYNAMIC_CLASS(wxFont, wxGDIObject)
 
 void wxFont::Init()
 {
 
 void wxFont::Init()
 {

-    if (wxTheFontList)
-        wxTheFontList->Append( this );

 }
 
 wxFont::wxFont(const wxNativeFontInfo& info)
 }
 
 wxFont::wxFont(const wxNativeFontInfo& info)


@@ -334,8 +332,6 @@ void wxFont::Unshare()
 
 wxFont::~wxFont()
 {
 
 wxFont::~wxFont()
 {

-    if (wxTheFontList)
-        wxTheFontList->DeleteObject( this );

 }
 
 // ----------------------------------------------------------------------------
 }
 
 // ----------------------------------------------------------------------------


@@ -493,6 +489,12 @@ GdkFont *GtkGetDefaultGuiFont()
         }
         gtk_widget_destroy( widget );
     }
         }
         gtk_widget_destroy( widget );
     }

+    else
+    {
+        // already have it, but ref it once more before returning
+        gdk_font_ref(g_systemDefaultGuiFont);
+    }
+

     return g_systemDefaultGuiFont;
 }
 
     return g_systemDefaultGuiFont;
 }