X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/03647350fc7cd141953c72e0284e928847d30f44..51623cc53f350935337e57930eaaf1afe9a48c3b:/include/wx/fontutil.h?ds=sidebyside diff --git a/include/wx/fontutil.h b/include/wx/fontutil.h index 32c2806104..106205f24c 100644 --- a/include/wx/fontutil.h +++ b/include/wx/fontutil.h @@ -71,6 +71,11 @@ class WXDLLIMPEXP_CORE wxNativeFontInfo public: #if wxUSE_PANGO PangoFontDescription *description; + + // Pango font description doesn't have these attributes, so we store them + // separately and handle them ourselves in {To,From}String() methods. + bool m_underlined; + bool m_strikethrough; #elif defined(_WX_X_FONTLIKE) // the members can't be accessed directly as we only parse the // xFontName on demand @@ -154,9 +159,6 @@ public: void EnsureValid(); bool m_descriptorValid; -#if wxOSX_USE_CORE_TEXT - CTFontDescriptorRef m_ctFontDescriptor; -#endif #if wxOSX_USE_ATSU_TEXT bool m_atsuFontValid; @@ -168,13 +170,6 @@ public: wxInt16 m_qdFontFamily; wxInt16 m_qdFontStyle; #endif -#endif - -#if wxOSX_USE_COCOA - WX_NSFontDescriptor m_nsFontDescriptor; - void OSXValidateNSFontDescriptor(); -#endif -#if wxOSX_USE_IPHONE #endif int m_pointSize; @@ -182,6 +177,7 @@ public: wxFontStyle m_style; wxFontWeight m_weight; bool m_underlined; + bool m_strikethrough; wxString m_faceName; wxFontEncoding m_encoding; public : @@ -197,6 +193,7 @@ public : wxFontStyle style; wxFontWeight weight; bool underlined; + bool strikethrough; wxString faceName; wxFontEncoding encoding; #endif // platforms @@ -234,6 +231,7 @@ public: SetStyle((wxFontStyle)font.GetStyle()); SetWeight((wxFontWeight)font.GetWeight()); SetUnderlined(font.GetUnderlined()); + SetStrikethrough(font.GetStrikethrough()); #if defined(__WXMSW__) if ( font.IsUsingSizeInPixels() ) SetPixelSize(font.GetPixelSize()); @@ -262,6 +260,7 @@ public: wxFontStyle GetStyle() const; wxFontWeight GetWeight() const; bool GetUnderlined() const; + bool GetStrikethrough() const; wxString GetFaceName() const; wxFontFamily GetFamily() const; wxFontEncoding GetEncoding() const; @@ -271,6 +270,7 @@ public: void SetStyle(wxFontStyle style); void SetWeight(wxFontWeight weight); void SetUnderlined(bool underlined); + void SetStrikethrough(bool strikethrough); bool SetFaceName(const wxString& facename); void SetFamily(wxFontFamily family); void SetEncoding(wxFontEncoding encoding);