better native font support for wxGTK

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@13642 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2002-01-18 20:01:49 +00:00
parent 1542c42e72
commit 409d5a5860
14 changed files with 933 additions and 499 deletions

View File

@@ -36,12 +36,13 @@ public:
// ctors and such
wxFont() { Init(); }
wxFont(const wxFont& font) : wxFontBase() { Init(); Ref(font); }
wxFont(const wxString& fontname,
wxFontEncoding fontenc = wxFONTENCODING_DEFAULT)
// wxGTK-specific
wxFont(const wxString& fontname)
{
Init();
Create(fontname, fontenc);
Create(fontname);
}
wxFont(const wxNativeFontInfo& info);
@@ -68,9 +69,7 @@ public:
wxFontEncoding encoding = wxFONTENCODING_DEFAULT);
// wxGTK-specific
bool Create(const wxString& fontname,
wxFontEncoding fontenc = wxFONTENCODING_DEFAULT);
bool Create(const wxNativeFontInfo& fontinfo);
bool Create(const wxString& fontname);
~wxFont();
@@ -108,9 +107,6 @@ protected:
// common part of all ctors
void Init();
// do we have the XFLD for this font (or just wxWin description)?
inline bool HasNativeFont() const;
private:
DECLARE_DYNAMIC_CLASS(wxFont)
};