--- src/gtk/window.cpp	2003-09-21 13:31:58.000000000 +0200
+++ src/gtk/window.cpp.oden	2005-10-26 22:02:37.000000000 +0200
@@ -4013,12 +4013,11 @@
     return gtk_widget_get_pango_context( m_widget );
 }
 
+// MR: Returns the same as GtkGetPangoDefaultContext until the symbol can be removed in 2.7.x
 PangoContext *wxWindowGTK::GtkGetPangoX11Context()
 {
-    if (!m_x11Context)
-        m_x11Context = pango_x_get_context( gdk_display );
+    return gtk_widget_get_pango_context( m_widget );
 
-    return m_x11Context;
 }
 #endif