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

fixing cairo bugs under OS X

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@49832 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Stefan Csomor
2007-11-11 16:46:47 +00:00
parent 3b257996a2
commit 3e70093612
1 changed files with 15 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/generic/graphicc.cpp
View File

@@ -735,6 +735,7 @@ void wxCairoFontData::Apply( wxGraphicsContext* context )
// the rest is done using Pango layouts // the rest is done using Pango layouts
#elif defined(__WXMAC__) #elif defined(__WXMAC__)
cairo_set_font_face(ctext, m_font); cairo_set_font_face(ctext, m_font);
cairo_set_font_size(ctext, m_size );
#else #else
cairo_select_font_face(ctext, m_fontName, m_slant, m_weights ); cairo_select_font_face(ctext, m_fontName, m_slant, m_weights );
cairo_set_font_size(ctext, m_size ); cairo_set_font_size(ctext, m_size );
@@ -1407,6 +1408,17 @@ void wxCairoContext::GetTextExtent( const wxString &str, wxDouble *width, wxDoub
{ {
cairo_font_extents_t fe; cairo_font_extents_t fe;
cairo_font_extents(m_context, &fe); cairo_font_extents(m_context, &fe);
// some backends have negative descents
if ( fe.descent < 0 )
fe.descent = -fe.descent;
if ( fe.height < (fe.ascent + fe.descent ) )
{
// some backends are broken re height ... (eg currently ATSUI)
fe.height = fe.ascent + fe.descent;
}
if (height) if (height)
*height = fe.height; *height = fe.height;
@@ -1498,6 +1510,9 @@ private :
IMPLEMENT_DYNAMIC_CLASS(wxCairoRenderer,wxGraphicsRenderer) IMPLEMENT_DYNAMIC_CLASS(wxCairoRenderer,wxGraphicsRenderer)
static wxCairoRenderer gs_cairoGraphicsRenderer; static wxCairoRenderer gs_cairoGraphicsRenderer;
// temporary hack to allow creating a cairo context on any platform
extern wxGraphicsRenderer* gCairoRenderer;
wxGraphicsRenderer* gCairoRenderer = &gs_cairoGraphicsRenderer;
#ifdef __WXGTK__ #ifdef __WXGTK__
wxGraphicsRenderer* wxGraphicsRenderer::GetDefaultRenderer() wxGraphicsRenderer* wxGraphicsRenderer::GetDefaultRenderer()