X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/42c60e749f84bae32b372d1aedfc9fef74036aee..bcd846ea7191d33d86e28ee1927b461c54d2fb8f:/src/gtk/dcmemory.cpp?ds=sidebyside

diff --git a/src/gtk/dcmemory.cpp b/src/gtk/dcmemory.cpp
index cab5297746..768465ba8c 100644
--- a/src/gtk/dcmemory.cpp
+++ b/src/gtk/dcmemory.cpp
@@ -7,10 +7,6 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#pragma implementation "dcmemory.h"
-#endif
-
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
@@ -33,6 +29,9 @@ wxMemoryDC::wxMemoryDC() : wxWindowDC()
     
 #ifdef __WXGTK20__
     m_context = gdk_pango_context_get();
+    // Note: The Sun customised version of Pango shipping with Solaris 10
+    // crashes if the language is left NULL (see bug 1374114)
+    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
@@ -47,6 +46,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