[wxGTK2] Runtime check for pango_font_family_is_monospace in wxFont::GetFamily (gtk2...

applications compiled against gtk2.4 or newer to work with gtk2.2 or older runtime. wxFontEnumerator TODO

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35358 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/src/unix/fontutil.cpp b/src/unix/fontutil.cpp
index 13f155a6d2a80a1b10d6825795c7b3d78da7dbf7..7b1801857e34c3e844e8a6e9ed31497842f634d4 100644 (file)
--- a/src/unix/fontutil.cpp
+++ b/src/unix/fontutil.cpp
@@ -145,8 +145,11 @@ wxFontFamily wxNativeFontInfo::GetFamily() const
         ret = wxFONTFAMILY_TELETYPE; // begins with "Monospace"
     else if (strncmp( family_text, "courier", 7 ) == 0)
         ret = wxFONTFAMILY_TELETYPE; // begins with "Courier"
-#ifdef HAVE_PANGO_FONT_FAMILY_IS_MONOSPACE
+#if defined(__WXGTK24__) || defined(HAVE_PANGO_FONT_FAMILY_IS_MONOSPACE)
     else
+#ifdef __WXGTK24__
+    if (!gtk_check_version(2,4,0))
+#endif
     {
         PangoFontFamily **families;
         PangoFontFamily  *family = NULL;
@@ -178,7 +181,7 @@ wxFontFamily wxNativeFontInfo::GetFamily() const
         if (family != NULL && pango_font_family_is_monospace( family ))
             ret = wxFONTFAMILY_TELETYPE; // is deemed a monospace font by pango
     }
-#endif // pango_font_family_is_monospace
+#endif // gtk24 || HAVE_PANGO_FONT_FAMILY_IS_MONOSPACE
 
     if (ret == wxFONTFAMILY_DEFAULT)
     {