The Sun customised version of Pango shipping with Solaris 10 crashes if the
language is left NULL (bug 1374114) git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36597 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -29,6 +29,7 @@ wxMemoryDC::wxMemoryDC() : wxWindowDC()
|
||||
|
||||
#ifdef __WXGTK20__
|
||||
m_context = gdk_pango_context_get();
|
||||
pango_context_set_language( m_context, gtk_get_default_language() );
|
||||
m_layout = pango_layout_new( m_context );
|
||||
m_fontdesc = pango_font_description_copy( pango_context_get_font_description( m_context ) );
|
||||
#endif
|
||||
@@ -43,6 +44,7 @@ wxMemoryDC::wxMemoryDC( wxDC *WXUNUSED(dc) )
|
||||
|
||||
#ifdef __WXGTK20__
|
||||
m_context = gdk_pango_context_get();
|
||||
pango_context_set_language( m_context, gtk_get_default_language() );
|
||||
m_layout = pango_layout_new( m_context );
|
||||
m_fontdesc = pango_font_description_copy( pango_context_get_font_description( m_context ) );
|
||||
#endif
|
||||
|
@@ -39,6 +39,7 @@ wxScreenDC::wxScreenDC()
|
||||
|
||||
#ifdef __WXGTK20__
|
||||
m_context = gdk_pango_context_get();
|
||||
pango_context_set_language( m_context, gtk_get_default_language() );
|
||||
m_layout = pango_layout_new( m_context );
|
||||
// m_fontdesc = pango_font_description_copy( widget->style->font_desc );
|
||||
#endif
|
||||
|
@@ -29,6 +29,7 @@ wxMemoryDC::wxMemoryDC() : wxWindowDC()
|
||||
|
||||
#ifdef __WXGTK20__
|
||||
m_context = gdk_pango_context_get();
|
||||
pango_context_set_language( m_context, gtk_get_default_language() );
|
||||
m_layout = pango_layout_new( m_context );
|
||||
m_fontdesc = pango_font_description_copy( pango_context_get_font_description( m_context ) );
|
||||
#endif
|
||||
@@ -43,6 +44,7 @@ wxMemoryDC::wxMemoryDC( wxDC *WXUNUSED(dc) )
|
||||
|
||||
#ifdef __WXGTK20__
|
||||
m_context = gdk_pango_context_get();
|
||||
pango_context_set_language( m_context, gtk_get_default_language() );
|
||||
m_layout = pango_layout_new( m_context );
|
||||
m_fontdesc = pango_font_description_copy( pango_context_get_font_description( m_context ) );
|
||||
#endif
|
||||
|
@@ -39,6 +39,7 @@ wxScreenDC::wxScreenDC()
|
||||
|
||||
#ifdef __WXGTK20__
|
||||
m_context = gdk_pango_context_get();
|
||||
pango_context_set_language( m_context, gtk_get_default_language() );
|
||||
m_layout = pango_layout_new( m_context );
|
||||
// m_fontdesc = pango_font_description_copy( widget->style->font_desc );
|
||||
#endif
|
||||
|
Reference in New Issue
Block a user