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

Fix wxGTK crash on startup on 64-bit solaris 10

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35617 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Michael Wetherell
2005-09-20 12:01:54 +00:00
parent fdd2ec3e96
commit 34a35823ea
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/unix/fontutil.cpp
View File

@@ -139,7 +139,11 @@ wxString wxNativeFontInfo::GetFaceName() const
wxFontFamily wxNativeFontInfo::GetFamily() const wxFontFamily wxNativeFontInfo::GetFamily() const
{ {
wxFontFamily ret = wxFONTFAMILY_DEFAULT; wxFontFamily ret = wxFONTFAMILY_DEFAULT;
char *family_text = g_ascii_strdown( pango_font_description_get_family( description ), -1 ); // note: not passing -1 as the 2nd parameter to g_ascii_strdown to work
// around a bug in the 64-bit glib shipped with solaris 10, -1 causes it
// to try to allocate 2^32 bytes.
const char *family_name = pango_font_description_get_family( description );
char *family_text = g_ascii_strdown( family_name, family_name ? strlen( family_name ) : 0 );
// 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"