Applied patch [ 673055 ] Text rendering in wxGTK 2.4.0 and GTK2 fixed

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

diff --git a/src/gtk/dcclient.cpp b/src/gtk/dcclient.cpp
index 5f1953872d2fbd0a0a7d627d2632177601fd06b3..b3dd4904a7c33aaa372476b1aba177ff46dc5f07 100644 (file)
--- a/src/gtk/dcclient.cpp
+++ b/src/gtk/dcclient.cpp
@@ -394,6 +394,14 @@ void wxWindowDC::SetUpDC()
         m_bgGC = wxGetPoolGC( m_window, wxBG_COLOUR );
     }
 
+#ifdef __WXGTK20__
+    if (m_isMemDC)
+    {
+        m_context = gdk_pango_context_get();
+        m_fontdesc = pango_context_get_font_description(m_context);
+    }
+#endif
+
     /* background colour */
     m_backgroundBrush = *wxWHITE_BRUSH;
     m_backgroundBrush.GetColour().CalcPixel( m_cmap );

diff --git a/src/gtk1/dcclient.cpp b/src/gtk1/dcclient.cpp
index 5f1953872d2fbd0a0a7d627d2632177601fd06b3..b3dd4904a7c33aaa372476b1aba177ff46dc5f07 100644 (file)
--- a/src/gtk1/dcclient.cpp
+++ b/src/gtk1/dcclient.cpp
@@ -394,6 +394,14 @@ void wxWindowDC::SetUpDC()
         m_bgGC = wxGetPoolGC( m_window, wxBG_COLOUR );
     }
 
+#ifdef __WXGTK20__
+    if (m_isMemDC)
+    {
+        m_context = gdk_pango_context_get();
+        m_fontdesc = pango_context_get_font_description(m_context);
+    }
+#endif
+
     /* background colour */
     m_backgroundBrush = *wxWHITE_BRUSH;
     m_backgroundBrush.GetColour().CalcPixel( m_cmap );