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

diff --git a/src/gtk/dcmemory.cpp b/src/gtk/dcmemory.cpp
index c6ecf57072547a953a6caa28045150d8c1066a28..ee801a6f56796541f72fa4fb70ebaad560224136 100644 (file)
--- 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();
     
 #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
     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();
     
 #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
     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 152c7c72cfc8f7f021a50f5f6b10d5cf968a8025..d5ce96c175876a4d82d28a8fcefc5078bd2d4755 100644 (file)
--- a/src/gtk/dcscreen.cpp
+++ b/src/gtk/dcscreen.cpp
@@ -39,6 +39,7 @@ wxScreenDC::wxScreenDC()
 
 #ifdef __WXGTK20__
     m_context = gdk_pango_context_get();
 
 #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
     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 c6ecf57072547a953a6caa28045150d8c1066a28..ee801a6f56796541f72fa4fb70ebaad560224136 100644 (file)
--- 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();
     
 #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
     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();
     
 #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
     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 152c7c72cfc8f7f021a50f5f6b10d5cf968a8025..d5ce96c175876a4d82d28a8fcefc5078bd2d4755 100644 (file)
--- a/src/gtk1/dcscreen.cpp
+++ b/src/gtk1/dcscreen.cpp
@@ -39,6 +39,7 @@ wxScreenDC::wxScreenDC()
 
 #ifdef __WXGTK20__
     m_context = gdk_pango_context_get();
 
 #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
     m_layout = pango_layout_new( m_context );
 //    m_fontdesc = pango_font_description_copy( widget->style->font_desc );
 #endif