Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

no real change; just fix the argument name of the wxFont(const wxString&) ctor under wxGTK since it was misleading

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@60112 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Francesco Montorsi
2009-04-12 16:06:43 +00:00
parent 375330ac40
commit 34be948fdb
2 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
include/wx/gtk/font.h
View File

@@ -20,9 +20,9 @@ public:
wxFont() { } wxFont() { }
// wxGTK-specific // wxGTK-specific
wxFont(const wxString& fontname) wxFont(const wxString& nativeFontInfoString)
{ {
Create(fontname); Create(nativeFontInfoString);
} }
wxFont(const wxNativeFontInfo& info); wxFont(const wxNativeFontInfo& info);

7
src/gtk/font.cpp
View File

@@ -56,8 +56,7 @@ public:
const wxString& faceName = wxEmptyString, const wxString& faceName = wxEmptyString,
wxFontEncoding encoding = wxFONTENCODING_DEFAULT); wxFontEncoding encoding = wxFONTENCODING_DEFAULT);
// from XFLD wxFontRefData(const wxString& nativeFontInfoString);
wxFontRefData(const wxString& fontname);
// copy ctor // copy ctor
wxFontRefData( const wxFontRefData& data ); 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();
} }