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

set PangoContext's language correctly

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@28221 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Václav Slavík
2004-07-13 12:07:42 +00:00
parent fd43b1b3ea
commit feb7b71d45
1 changed files with 24 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
src/generic/dcpsg.cpp
View File

@@ -1285,6 +1285,25 @@ void draw_bezier_outline(wxPostScriptDC* caller,
#endif #endif
#if wxUSE_PANGO
static void InitializePangoContext(PangoContext *context)
{
#ifdef __WXGTK__
pango_context_set_base_dir(context,
gtk_widget_get_default_direction() == GTK_TEXT_DIR_LTR ?
PANGO_DIRECTION_LTR : PANGO_DIRECTION_RTL);
pango_context_set_language(context, gtk_get_default_language());
#else
// FIXME: assuming LTR is incorrect!
pango_context_set_base_dir(context, PANGO_DIRECTION_LTR);
wxString lang = wxLocale::GetCanonicalName();
pango_context_set_language(context,
pango_language_from_string(lang::ToAscii()));
#endif
}
#endif
void wxPostScriptDC::DoDrawText( const wxString& text, wxCoord x, wxCoord y ) void wxPostScriptDC::DoDrawText( const wxString& text, wxCoord x, wxCoord y )
{ {
wxCHECK_RET( m_ok, wxT("invalid postscript dc") ); wxCHECK_RET( m_ok, wxT("invalid postscript dc") );
@@ -1334,12 +1353,11 @@ void wxPostScriptDC::DoDrawText( const wxString& text, wxCoord x, wxCoord y )
int pango_dpi = 600; int pango_dpi = 600;
PangoContext *context = pango_ft2_get_context ( pango_dpi, pango_dpi ); PangoContext *context = pango_ft2_get_context ( pango_dpi, pango_dpi );
InitializePangoContext(context);
double scale = (double)pango_dpi / (double)ps_dpi; double scale = (double)pango_dpi / (double)ps_dpi;
scale /= m_userScaleY; scale /= m_userScaleY;
pango_context_set_language (context, pango_language_from_string ("en_US"));
pango_context_set_base_dir (context, PANGO_DIRECTION_LTR );
pango_context_set_font_description (context, m_font.GetNativeFontInfo()->description ); pango_context_set_font_description (context, m_font.GetNativeFontInfo()->description );
PangoLayout *layout = pango_layout_new (context); PangoLayout *layout = pango_layout_new (context);
@@ -2069,12 +2087,11 @@ void wxPostScriptDC::DoGetTextExtent(const wxString& string,
int pango_dpi = 600; int pango_dpi = 600;
PangoContext *context = pango_ft2_get_context ( pango_dpi, pango_dpi ); PangoContext *context = pango_ft2_get_context ( pango_dpi, pango_dpi );
InitializePangoContext(context);
double scale = pango_dpi / wx_dpi; double scale = pango_dpi / wx_dpi;
scale /= m_userScaleY; scale /= m_userScaleY;
pango_context_set_language (context, pango_language_from_string ("en_US"));
pango_context_set_base_dir (context, PANGO_DIRECTION_LTR );
PangoLayout *layout = pango_layout_new (context); PangoLayout *layout = pango_layout_new (context);
PangoFontDescription *desc = fontToUse->GetNativeFontInfo()->description; PangoFontDescription *desc = fontToUse->GetNativeFontInfo()->description;
@@ -2097,7 +2114,7 @@ void wxPostScriptDC::DoGetTextExtent(const wxString& string,
PangoLayoutIter *iter = pango_layout_get_iter(layout); PangoLayoutIter *iter = pango_layout_get_iter(layout);
int baseline = pango_layout_iter_get_baseline(iter); int baseline = pango_layout_iter_get_baseline(iter);
pango_layout_iter_free(iter); pango_layout_iter_free(iter);
*descent = *y - PANGO_PIXELS(baseline) / scale; *descent = wxCoord(*y - PANGO_PIXELS(baseline) / scale);
} }
if (externalLeading) (*externalLeading) = 0; // ?? if (externalLeading) (*externalLeading) = 0; // ??