Reverting patch 1325857

[wxWidgets.git] / src / gtk / dcscreen.cpp

diff --git a/src/gtk/dcscreen.cpp b/src/gtk/dcscreen.cpp
index d5ce96c175876a4d82d28a8fcefc5078bd2d4755..c4a198a6186da9898f098423a6f80c82aa1cf3dc 100644 (file)
--- a/src/gtk/dcscreen.cpp
+++ b/src/gtk/dcscreen.cpp
@@ -37,12 +37,12 @@ wxScreenDC::wxScreenDC()
     m_cmap = gdk_colormap_get_system();
     m_window = GDK_ROOT_PARENT();
 
     m_cmap = gdk_colormap_get_system();
     m_window = GDK_ROOT_PARENT();
 

-#ifdef __WXGTK20__

     m_context = gdk_pango_context_get();
     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( widget->style->font_desc );
     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_isScreenDC = TRUE;
 
 
     m_isScreenDC = TRUE;