correcting last commit

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

diff --git a/src/gtk1/dcscreen.cpp b/src/gtk1/dcscreen.cpp
index a79f479bbf60a8602e4bfc1a27b0251c8f565d1e..1f46868b4e390ebbad55a88c5b309256600a1f94 100644 (file)
--- a/src/gtk1/dcscreen.cpp
+++ b/src/gtk1/dcscreen.cpp
@@ -7,10 +7,13 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 

-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)

 #pragma implementation "dcscreen.h"
 #endif
 
 #pragma implementation "dcscreen.h"
 #endif
 

+// For compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"
+

 #include "wx/dcscreen.h"
 #include "wx/window.h"
 
 #include "wx/dcscreen.h"
 #include "wx/window.h"
 


@@ -38,6 +41,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_layout = pango_layout_new( m_context );
+//    m_fontdesc = pango_font_description_copy( widget->style->font_desc );
+#endif
+

     m_isScreenDC = TRUE;
 
     SetUpDC();
     m_isScreenDC = TRUE;
 
     SetUpDC();