X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/dccb75b60dfdca505edf8bb9512979501277c142..623ba2e118508abc3e1d3b29d2a340297c9920c6:/include/wx/font.h diff --git a/include/wx/font.h b/include/wx/font.h index 262bce29f5..7eac1f1dc5 100644 --- a/include/wx/font.h +++ b/include/wx/font.h @@ -78,9 +78,7 @@ class WXDLLEXPORT wxFontBase : public wxGDIObject { public: // creator function -#ifdef __DARWIN__ - virtual ~wxFontBase() { } -#endif + virtual ~wxFontBase(); // from the font components static wxFont *New( @@ -114,7 +112,9 @@ public: virtual wxString GetFaceName() const = 0; virtual wxFontEncoding GetEncoding() const = 0; virtual wxNativeFontInfo *GetNativeFontInfo() const; + wxString GetNativeFontInfoDesc() const; + wxString GetNativeFontInfoUserDesc() const; // change the font characteristics virtual void SetPointSize( int pointSize ) = 0; @@ -125,7 +125,9 @@ public: virtual void SetUnderlined( bool underlined ) = 0; virtual void SetEncoding(wxFontEncoding encoding) = 0; virtual void SetNativeFontInfo(const wxNativeFontInfo& info); + void SetNativeFontInfo(const wxString& info); + void SetNativeFontInfoUserDesc(const wxString& info); // translate the fonts into human-readable string (i.e. GetStyleString() // will return "wxITALIC" for an italic font, ...)