X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/f11bdd03b9623a61bfe3137beeefd7b1256bb9a1..761df41e86ceeed56d32c038a6c9f88554d4f47a:/include/wx/font.h diff --git a/include/wx/font.h b/include/wx/font.h index 1aad6d9172..f324d115c9 100644 --- a/include/wx/font.h +++ b/include/wx/font.h @@ -114,7 +114,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; @@ -126,7 +128,8 @@ public: virtual void SetEncoding(wxFontEncoding encoding) = 0; virtual void SetNativeFontInfo(const wxNativeFontInfo& info); - // VZ: there is no void SetNativeFontInfo(const wxString& info), needed? + 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, ...) @@ -163,8 +166,6 @@ private: #include "wx/gtk/font.h" #elif defined(__WXMGL__) #include "wx/mgl/font.h" -#elif defined(__WXQT__) - #include "wx/qt/font.h" #elif defined(__WXMAC__) #include "wx/mac/font.h" #elif defined(__WXPM__)