From 203b65dd29ad224968b9d7dbb227cecaeec5568c Mon Sep 17 00:00:00 2001 From: Michael Wetherell Date: Fri, 30 Dec 2005 13:30:08 +0000 Subject: [PATCH] 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 --- src/gtk/dcmemory.cpp | 2 ++ src/gtk/dcscreen.cpp | 1 + src/gtk1/dcmemory.cpp | 2 ++ src/gtk1/dcscreen.cpp | 1 + 4 files changed, 6 insertions(+) diff --git a/src/gtk/dcmemory.cpp b/src/gtk/dcmemory.cpp index c6ecf57072..ee801a6f56 100644 --- a/src/gtk/dcmemory.cpp +++ b/src/gtk/dcmemory.cpp @@ -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 diff --git a/src/gtk/dcscreen.cpp b/src/gtk/dcscreen.cpp index 152c7c72cf..d5ce96c175 100644 --- a/src/gtk/dcscreen.cpp +++ b/src/gtk/dcscreen.cpp @@ -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 diff --git a/src/gtk1/dcmemory.cpp b/src/gtk1/dcmemory.cpp index c6ecf57072..ee801a6f56 100644 --- a/src/gtk1/dcmemory.cpp +++ b/src/gtk1/dcmemory.cpp @@ -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 diff --git a/src/gtk1/dcscreen.cpp b/src/gtk1/dcscreen.cpp index 152c7c72cf..d5ce96c175 100644 --- a/src/gtk1/dcscreen.cpp +++ b/src/gtk1/dcscreen.cpp @@ -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 -- 2.50.0