#pragma hdrstop
#endif
+#include "wx/fontutil.h"
+
#ifndef WX_PRECOMP
+ #include "wx/app.h"
#include "wx/font.h" // wxFont enums
#include "wx/encinfo.h"
#include "wx/hash.h"
#include "wx/utils.h" // for wxGetDisplay()
+ #include "wx/module.h"
#endif // PCH
-#include "wx/fontutil.h"
#include "wx/fontmap.h"
#include "wx/tokenzr.h"
-#include "wx/module.h"
+#include "wx/fontenum.h"
#if wxUSE_PANGO
#include "pango/pango.h"
#ifdef __WXGTK20__
-#include "wx/gtk/private.h"
-extern GtkWidget *wxGetRootWindow();
+ #include "wx/gtk/private.h"
+ extern GtkWidget *wxGetRootWindow();
+
+ #define wxPANGO_CONV wxGTK_CONV_SYS
+ #define wxPANGO_CONV_BACK wxGTK_CONV_BACK_SYS
#else
-#include "wx/x11/private.h"
+ #include "wx/x11/private.h"
+ #include "wx/gtk/private/string.h"
+
+ #define wxPANGO_CONV(s) (wxConvUTF8.cWX2MB((s)))
+ #define wxPANGO_CONV_BACK(s) (wxConvUTF8.cMB2WX((s)))
#endif
// ----------------------------------------------------------------------------
wxString wxNativeFontInfo::GetFaceName() const
{
- wxString tmp = wxGTK_CONV_BACK( pango_font_description_get_family( description ) );
-
- return tmp;
+ return wxPANGO_CONV_BACK(pango_font_description_get_family(description));
}
wxFontFamily wxNativeFontInfo::GetFamily() const
// 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 );
+ if ( !family_name )
+ return ret;
+
+ 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"
else if (strncmp( family_text, "courier", 7 ) == 0)
ret = wxFONTFAMILY_TELETYPE; // begins with "Courier"
-#if defined(__WXGTK24__) || defined(HAVE_PANGO_FONT_FAMILY_IS_MONOSPACE)
+#if defined(__WXGTK20__) || defined(HAVE_PANGO_FONT_FAMILY_IS_MONOSPACE)
else
-#ifdef __WXGTK24__
+#ifdef __WXGTK20__
if (!gtk_check_version(2,4,0))
#endif
{
if (family != NULL && pango_font_family_is_monospace( family ))
ret = wxFONTFAMILY_TELETYPE; // is deemed a monospace font by pango
}
-#endif // gtk24 || HAVE_PANGO_FONT_FAMILY_IS_MONOSPACE
+#endif // GTK+ 2 || HAVE_PANGO_FONT_FAMILY_IS_MONOSPACE
if (ret == wxFONTFAMILY_DEFAULT)
{
ret = wxFONTFAMILY_DECORATIVE; // Begins with "Old" - "Old English", "Old Town"
}
- free(family_text);
return ret;
}
wxFAIL_MSG( _T("not implemented") );
}
-void wxNativeFontInfo::SetFaceName(const wxString& facename)
+bool wxNativeFontInfo::SetFaceName(const wxString& facename)
{
- pango_font_description_set_family(description, wxGTK_CONV_SYS(facename));
+ pango_font_description_set_family(description, wxPANGO_CONV(facename));
+ return true;
}
void wxNativeFontInfo::SetFamily(wxFontFamily WXUNUSED(family))
if (description)
pango_font_description_free( description );
- description = pango_font_description_from_string( wxGTK_CONV_SYS( s ) );
+ // there is a bug in at least pango <= 1.13 which makes it (or its backends)
+ // segfault for very big point sizes and for negative point sizes.
+ // To workaround that bug for pango <= 1.13
+ // (see http://bugzilla.gnome.org/show_bug.cgi?id=340229)
+ // we do the check on the size here using same (arbitrary) limits used by
+ // pango > 1.13. Note that the segfault could happen also for pointsize
+ // smaller than this limit !!
+ wxString str(s);
+ const size_t pos = str.find_last_of(_T(" "));
+ double size;
+ if ( pos != wxString::npos && wxString(str, pos + 1).ToDouble(&size) )
+ {
+ wxString sizeStr;
+ if ( size < 1 )
+ sizeStr = _T("1");
+ else if ( size >= 1E6 )
+ sizeStr = _T("1E6");
+
+ if ( !sizeStr.empty() )
+ {
+ // replace the old size with the adjusted one
+ str = wxString(s, 0, pos) + sizeStr;
+ }
+ }
+
+ description = pango_font_description_from_string(wxPANGO_CONV(str));
+
+#if wxUSE_FONTENUM
+ // ensure a valid facename is selected
+ if (!wxFontEnumerator::IsValidFacename(GetFaceName()))
+ SetFaceName(wxNORMAL_FONT->GetFaceName());
+#endif // wxUSE_FONTENUM
return true;
}
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 wxPANGO_CONV_BACK(str);
}
bool wxNativeFontInfo::FromUserString(const wxString& s)
return ToString();
}
-// ----------------------------------------------------------------------------
-// wxNativeEncodingInfo
-// ----------------------------------------------------------------------------
-
-bool wxNativeEncodingInfo::FromString(const wxString& WXUNUSED(s))
-{
- return false;
-}
-
-wxString wxNativeEncodingInfo::ToString() const
-{
- return wxEmptyString;
-}
-
-bool wxTestFontEncoding(const wxNativeEncodingInfo& WXUNUSED(info))
-{
- return true;
-}
-
-bool wxGetNativeFontEncoding(wxFontEncoding encoding,
- wxNativeEncodingInfo *info)
-{
- // all encodings are available in GTK+ 2 because we translate text in any
- // encoding to UTF-8 internally anyhow
- info->facename.clear();
- info->encoding = encoding;
-
- return true;
-}
-
#else // GTK+ 1.x
#ifdef __X__
return wxFONTSTYLE_NORMAL;
}
- switch ( s[0] )
+ switch ( s[0].GetValue() )
{
default:
// again, unknown but consider normal by default
// can't do this under X
}
-void wxNativeFontInfo::SetFaceName(const wxString& facename)
+bool wxNativeFontInfo::SetFaceName(const wxString& facename)
{
SetXFontComponent(wxXLFD_FAMILY, facename);
+ return true;
}
void wxNativeFontInfo::SetFamily(wxFontFamily WXUNUSED(family))
projects / wxWidgets.git / blobdiff