removed corrected detection of wchar_t under Mac OS X (added in revision 1.355)

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

diff --git a/src/gtk1/font.cpp b/src/gtk1/font.cpp
index 22c761e6fced1f71798a3145eb9abee1c00b7af8..c8a4c8da16b251022b6d1cb634d7683328fea849 100644 (file)
--- a/src/gtk1/font.cpp
+++ b/src/gtk1/font.cpp
@@ -170,7 +170,7 @@ wxString wxNativeFontInfo::ToString() const
 {
     wxString s;
     
 {
     wxString s;
     

-    s.Printf("%d;%s", 
+    s.Printf(_T("%d;%s"),

              0,                         // version
              xFontName.c_str());
              
              0,                         // version
              xFontName.c_str());
              


@@ -493,6 +493,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;
 }