merged 2.2 branch

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@7748 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2000-07-15 19:51:35 +00:00
parent 8a693e6e04
commit f6bcfd974e
1835 changed files with 237729 additions and 67990 deletions
--- a/src/gtk1/font.cpp
+++ b/src/gtk1/font.cpp
@@ -71,7 +71,7 @@ private:
    wxString        m_faceName;
    wxFontEncoding  m_encoding;

-    friend wxFont;
+    friend class wxFont;
 };

 // ============================================================================
@@ -397,7 +397,7 @@ void wxFont::SetEncoding(wxFontEncoding encoding)

 static GdkFont *g_systemDefaultGuiFont = (GdkFont*) NULL;

-static GdkFont *GtkGetDefaultGuiFont()
+GdkFont *GtkGetDefaultGuiFont()
 {
    if (!g_systemDefaultGuiFont)
    {