X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/203b65dd29ad224968b9d7dbb227cecaeec5568c..3882e74621cd5833fddb432fe014bea66c16ee28:/src/gtk/dcscreen.cpp?ds=sidebyside

diff --git a/src/gtk/dcscreen.cpp b/src/gtk/dcscreen.cpp
index d5ce96c175..8e00545f96 100644
--- a/src/gtk/dcscreen.cpp
+++ b/src/gtk/dcscreen.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        dcscreen.cpp
+// Name:        src/gtk/dcscreen.cpp
 // Purpose:
 // Author:      Robert Roebling
 // Id:          $Id$
@@ -11,7 +11,10 @@
 #include "wx/wxprec.h"
 
 #include "wx/dcscreen.h"
-#include "wx/window.h"
+
+#ifndef WX_PRECOMP
+    #include "wx/window.h"
+#endif
 
 #include <gdk/gdk.h>
 #include <gdk/gdkx.h>
@@ -33,18 +36,18 @@ IMPLEMENT_DYNAMIC_CLASS(wxScreenDC,wxPaintDC)
 
 wxScreenDC::wxScreenDC()
 {
-    m_ok = FALSE;
+    m_ok = false;
     m_cmap = gdk_colormap_get_system();
-    m_window = GDK_ROOT_PARENT();
+    m_window = gdk_get_default_root_window();
 
-#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( widget->style->font_desc );
-#endif
 
-    m_isScreenDC = TRUE;
+    m_isScreenDC = true;
 
     SetUpDC();