From 8361f92be846ac953deb4b923827cca68fc1ad23 Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Sat, 6 May 2006 21:59:15 +0000 Subject: [PATCH] use wxGtkString instead of manual g_free()s (also fixed free/g_free mismatch) git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@39089 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/unix/fontutil.cpp | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/src/unix/fontutil.cpp b/src/unix/fontutil.cpp index 7ca376fb91..cc30f65aa1 100644 --- a/src/unix/fontutil.cpp +++ b/src/unix/fontutil.cpp @@ -143,7 +143,8 @@ wxFontFamily wxNativeFontInfo::GetFamily() const if ( !family_name ) return ret; - char *family_text = g_ascii_strdown( family_name, strlen( family_name ) ); + wxGtkString 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: if (strncmp( family_text, "monospace", 9 ) == 0) ret = wxFONTFAMILY_TELETYPE; // begins with "Monospace" @@ -201,7 +202,6 @@ wxFontFamily wxNativeFontInfo::GetFamily() const ret = wxFONTFAMILY_DECORATIVE; // Begins with "Old" - "Old English", "Old Town" } - free(family_text); return ret; } @@ -312,11 +312,9 @@ bool wxNativeFontInfo::FromString(const wxString& s) wxString wxNativeFontInfo::ToString() const { - char *str = pango_font_description_to_string( description ); - wxString tmp = wxGTK_CONV_BACK( str ); - g_free( str ); + wxGtkString str(pango_font_description_to_string( description )); - return tmp; + return wxGTK_CONV_BACK(str); } bool wxNativeFontInfo::FromUserString(const wxString& s) -- 2.45.2