pango_font_description_get_family() can return NULL
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@39084 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -140,7 +140,10 @@ wxFontFamily wxNativeFontInfo::GetFamily() const
|
|||||||
// around a bug in the 64-bit glib shipped with solaris 10, -1 causes it
|
// around a bug in the 64-bit glib shipped with solaris 10, -1 causes it
|
||||||
// to try to allocate 2^32 bytes.
|
// to try to allocate 2^32 bytes.
|
||||||
const char *family_name = pango_font_description_get_family( description );
|
const char *family_name = pango_font_description_get_family( description );
|
||||||
char *family_text = g_ascii_strdown( family_name, family_name ? strlen( family_name ) : 0 );
|
if ( !family_name )
|
||||||
|
return ret;
|
||||||
|
|
||||||
|
char *family_text = g_ascii_strdown( family_name, strlen( family_name ) );
|
||||||
// Check for some common fonts, to salvage what we can from the current win32 centric wxFont API:
|
// Check for some common fonts, to salvage what we can from the current win32 centric wxFont API:
|
||||||
if (strncmp( family_text, "monospace", 9 ) == 0)
|
if (strncmp( family_text, "monospace", 9 ) == 0)
|
||||||
ret = wxFONTFAMILY_TELETYPE; // begins with "Monospace"
|
ret = wxFONTFAMILY_TELETYPE; // begins with "Monospace"
|
||||||
|
Reference in New Issue
Block a user