wxScreenDC also needs a pango context and layout so it can do GetTextExtent

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@27042 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/src/gtk/dcscreen.cpp b/src/gtk/dcscreen.cpp
index b404333e13c64e59edbb08ce3af65bae4b27576f..1f46868b4e390ebbad55a88c5b309256600a1f94 100644 (file)
--- a/src/gtk/dcscreen.cpp
+++ b/src/gtk/dcscreen.cpp
@@ -41,6 +41,12 @@ wxScreenDC::wxScreenDC()
     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();

diff --git a/src/gtk1/dcscreen.cpp b/src/gtk1/dcscreen.cpp
index b404333e13c64e59edbb08ce3af65bae4b27576f..1f46868b4e390ebbad55a88c5b309256600a1f94 100644 (file)
--- a/src/gtk1/dcscreen.cpp
+++ b/src/gtk1/dcscreen.cpp
@@ -41,6 +41,12 @@ wxScreenDC::wxScreenDC()
     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();