[wxGTK2] Check if a family wasn't found for the description in GetFamily()
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35310 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -149,7 +149,7 @@ wxFontFamily wxNativeFontInfo::GetFamily() const
|
|||||||
else
|
else
|
||||||
{
|
{
|
||||||
PangoFontFamily **families;
|
PangoFontFamily **families;
|
||||||
PangoFontFamily *family;
|
PangoFontFamily *family = NULL;
|
||||||
int n_families;
|
int n_families;
|
||||||
pango_context_list_families(
|
pango_context_list_families(
|
||||||
#ifdef __WXGTK20__
|
#ifdef __WXGTK20__
|
||||||
@@ -175,7 +175,7 @@ wxFontFamily wxNativeFontInfo::GetFamily() const
|
|||||||
//BCI: Cache the wxFontFamily inside the class. Validate cache with
|
//BCI: Cache the wxFontFamily inside the class. Validate cache with
|
||||||
//BCI: g_ascii_strcasecmp(pango_font_description_get_family(description), pango_font_family_get_name(family)) == 0
|
//BCI: g_ascii_strcasecmp(pango_font_description_get_family(description), pango_font_family_get_name(family)) == 0
|
||||||
|
|
||||||
if (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 // pango_font_family_is_monospace
|
||||||
|
Reference in New Issue
Block a user