X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/6e711d5c093dcc758e3f1670caf845612ea9fa92..54946cc95b8493fb092b6a508bf22a1cd6fa4693:/include/wx/font.h diff --git a/include/wx/font.h b/include/wx/font.h index 12ce162da7..7ca50d5dbb 100644 --- a/include/wx/font.h +++ b/include/wx/font.h @@ -36,7 +36,10 @@ class WXDLLEXPORT wxFont; // font constants // ---------------------------------------------------------------------------- -// standard font families +// standard font families: these may be used only for the font creation, it +// doesn't make sense to query an existing font for its font family as, +// especially if the font had been created from a native font description, it +// may be unknown enum wxFontFamily { wxFONTFAMILY_DEFAULT = wxDEFAULT, @@ -46,7 +49,8 @@ enum wxFontFamily wxFONTFAMILY_SWISS = wxSWISS, wxFONTFAMILY_MODERN = wxMODERN, wxFONTFAMILY_TELETYPE = wxTELETYPE, - wxFONTFAMILY_MAX + wxFONTFAMILY_MAX, + wxFONTFAMILY_UNKNOWN = wxFONTFAMILY_MAX }; // font styles @@ -78,9 +82,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 +116,11 @@ public: virtual wxString GetFaceName() const = 0; virtual wxFontEncoding GetEncoding() const = 0; virtual wxNativeFontInfo *GetNativeFontInfo() const; + + virtual bool IsFixedWidth() const; + wxString GetNativeFontInfoDesc() const; + wxString GetNativeFontInfoUserDesc() const; // change the font characteristics virtual void SetPointSize( int pointSize ) = 0; @@ -126,7 +132,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, ...) @@ -136,10 +143,8 @@ public: // the default encoding is used for creating all fonts with default // encoding parameter - static wxFontEncoding GetDefaultEncoding() - { return ms_encodingDefault; } - static void SetDefaultEncoding(wxFontEncoding encoding) - { ms_encodingDefault = encoding; } + static wxFontEncoding GetDefaultEncoding() { return ms_encodingDefault; } + static void SetDefaultEncoding(wxFontEncoding encoding); protected: // get the internal data @@ -161,6 +166,8 @@ private: #include "wx/motif/font.h" #elif defined(__WXGTK__) #include "wx/gtk/font.h" +#elif defined(__WXX11__) + #include "wx/x11/font.h" #elif defined(__WXMGL__) #include "wx/mgl/font.h" #elif defined(__WXMAC__)