Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[wxGTK2] Runtime check for pango_font_family_is_monospace in wxFont::GetFamily (gtk2.4 runtime check) to allow wxGTK2

Browse Source 
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
This commit is contained in:
Mart Raudsepp
2005-08-29 01:18:07 +00:00
parent 631e67db81
commit c42f011ed6
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/unix/fontutil.cpp
View File

@@ -145,8 +145,11 @@ wxFontFamily wxNativeFontInfo::GetFamily() const
ret = wxFONTFAMILY_TELETYPE; // begins with "Monospace" ret = wxFONTFAMILY_TELETYPE; // begins with "Monospace"
else if (strncmp( family_text, "courier", 7 ) == 0) else if (strncmp( family_text, "courier", 7 ) == 0)
ret = wxFONTFAMILY_TELETYPE; // begins with "Courier" ret = wxFONTFAMILY_TELETYPE; // begins with "Courier"
#ifdef HAVE_PANGO_FONT_FAMILY_IS_MONOSPACE #if defined(__WXGTK24__) || defined(HAVE_PANGO_FONT_FAMILY_IS_MONOSPACE)
else else
#ifdef __WXGTK24__
if (!gtk_check_version(2,4,0))
#endif
{ {
PangoFontFamily **families; PangoFontFamily **families;
PangoFontFamily *family = NULL; PangoFontFamily *family = NULL;
@@ -178,7 +181,7 @@ wxFontFamily wxNativeFontInfo::GetFamily() const
if (family != NULL && pango_font_family_is_monospace( family )) if (family != NULL && pango_font_family_is_monospace( family ))
ret = wxFONTFAMILY_TELETYPE; // is deemed a monospace font by pango 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) if (ret == wxFONTFAMILY_DEFAULT)
{ {