no real change; just fix the argument name of the wxFont(const wxString&) ctor under...

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@60112 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/include/wx/gtk/font.h b/include/wx/gtk/font.h
index efd441ad5ac143aaa19492bed38a0d10480be536..4fb065741cbb84eda8771e4070aedd7d3b70f9c5 100644 (file)
--- a/include/wx/gtk/font.h
+++ b/include/wx/gtk/font.h
@@ -20,9 +20,9 @@ public:
     wxFont() { }
 
     // wxGTK-specific
     wxFont() { }
 
     // wxGTK-specific

-    wxFont(const wxString& fontname)
+    wxFont(const wxString& nativeFontInfoString)

     {
     {

-        Create(fontname);
+        Create(nativeFontInfoString);

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

diff --git a/src/gtk/font.cpp b/src/gtk/font.cpp
index d717d3a5d7de355a5028f04ce523595b1b08f9bd..30828c0fac5d0ad6cc5cd5bee44b9459daddc683 100644 (file)
--- a/src/gtk/font.cpp
+++ b/src/gtk/font.cpp
@@ -56,8 +56,7 @@ public:
                   const wxString& faceName = wxEmptyString,
                   wxFontEncoding encoding = wxFONTENCODING_DEFAULT);
 
                   const wxString& faceName = wxEmptyString,
                   wxFontEncoding encoding = wxFONTENCODING_DEFAULT);
 

-    // from XFLD
-    wxFontRefData(const wxString& fontname);
+    wxFontRefData(const wxString& nativeFontInfoString);

 
     // copy ctor
     wxFontRefData( const wxFontRefData& data );
 
     // copy ctor
     wxFontRefData( const wxFontRefData& data );


@@ -222,9 +221,9 @@ wxFontRefData::wxFontRefData(int size, wxFontFamily family, wxFontStyle style,
     Init(size, family, style, weight, underlined, faceName, encoding);
 }
 
     Init(size, family, style, weight, underlined, faceName, encoding);
 }
 

-wxFontRefData::wxFontRefData(const wxString& fontname)
+wxFontRefData::wxFontRefData(const wxString& nativeFontInfoString)

 {
 {

-    m_nativeFontInfo.FromString( fontname );
+    m_nativeFontInfo.FromString( nativeFontInfoString );

 
     InitFromNative();
 }
 
     InitFromNative();
 }