fix wxBitmapComboBox Gtk-CRITICAL assertion `GTK_IS_ENTRY (entry)' failed

[wxWidgets.git] / include / wx / fontutil.h

diff --git a/include/wx/fontutil.h b/include/wx/fontutil.h
index e12c021a34086f2026546c64b9549116c9785a59..106205f24cd1cf3344864fa71ace4c60828cac41 100644 (file)
--- a/include/wx/fontutil.h
+++ b/include/wx/fontutil.h
@@ -71,6 +71,11 @@ class WXDLLIMPEXP_CORE wxNativeFontInfo
 public:
 #if wxUSE_PANGO
     PangoFontDescription *description;
 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
 #elif defined(_WX_X_FONTLIKE)
     // the members can't be accessed directly as we only parse the
     // xFontName on demand


@@ -152,11 +157,8 @@ public:
 
     void Free();
     void EnsureValid();
 
     void Free();
     void EnsureValid();

-    
+

     bool m_descriptorValid;
     bool m_descriptorValid;

-#if wxOSX_USE_CORE_TEXT
-    CTFontDescriptorRef m_ctFontDescriptor;
-#endif

 
 #if wxOSX_USE_ATSU_TEXT
     bool            m_atsuFontValid;
 
 #if wxOSX_USE_ATSU_TEXT
     bool            m_atsuFontValid;


@@ -168,13 +170,6 @@ public:
     wxInt16         m_qdFontFamily;
     wxInt16         m_qdFontStyle;
 #endif
     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;
 #endif
 
     int           m_pointSize;


@@ -182,6 +177,7 @@ public:
     wxFontStyle   m_style;
     wxFontWeight  m_weight;
     bool          m_underlined;
     wxFontStyle   m_style;
     wxFontWeight  m_weight;
     bool          m_underlined;

+    bool          m_strikethrough;

     wxString      m_faceName;
     wxFontEncoding m_encoding;
 public :
     wxString      m_faceName;
     wxFontEncoding m_encoding;
 public :


@@ -197,6 +193,7 @@ public :
     wxFontStyle   style;
     wxFontWeight  weight;
     bool          underlined;
     wxFontStyle   style;
     wxFontWeight  weight;
     bool          underlined;

+    bool          strikethrough;

     wxString      faceName;
     wxFontEncoding encoding;
 #endif // platforms
     wxString      faceName;
     wxFontEncoding encoding;
 #endif // platforms


@@ -234,6 +231,7 @@ public:
         SetStyle((wxFontStyle)font.GetStyle());
         SetWeight((wxFontWeight)font.GetWeight());
         SetUnderlined(font.GetUnderlined());
         SetStyle((wxFontStyle)font.GetStyle());
         SetWeight((wxFontWeight)font.GetWeight());
         SetUnderlined(font.GetUnderlined());

+        SetStrikethrough(font.GetStrikethrough());

 #if defined(__WXMSW__)
         if ( font.IsUsingSizeInPixels() )
             SetPixelSize(font.GetPixelSize());
 #if defined(__WXMSW__)
         if ( font.IsUsingSizeInPixels() )
             SetPixelSize(font.GetPixelSize());


@@ -262,6 +260,7 @@ public:
     wxFontStyle GetStyle() const;
     wxFontWeight GetWeight() const;
     bool GetUnderlined() const;
     wxFontStyle GetStyle() const;
     wxFontWeight GetWeight() const;
     bool GetUnderlined() const;

+    bool GetStrikethrough() const;

     wxString GetFaceName() const;
     wxFontFamily GetFamily() const;
     wxFontEncoding GetEncoding() 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 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);
     bool SetFaceName(const wxString& facename);
     void SetFamily(wxFontFamily family);
     void SetEncoding(wxFontEncoding encoding);