[patch] wxGTK-2.6.1 pango patch

wxGTK-2.6.1-pango_x_get_context-fix.patch (text/plain), 2.24 KB, created by Sander Sweers on 2005-10-14 09:17:28 UTC

diff -ur wxWidgets-2.6.1.old/include/wx/gtk/window.h wxWidgets-2.6.1.new/include/wx/gtk/window.h
--- wxWidgets-2.6.1.old/include/wx/gtk/window.h	2004-08-29 13:32:37.000000000 +0000
+++ wxWidgets-2.6.1.new/include/wx/gtk/window.h	2005-10-14 17:02:34.056434920 +0000
@@ -167,8 +167,10 @@
     // Returns the X11 context which renders on the X11 client
     // side (which can be remote) and which usually is not
     // anti-aliased and is thus faster
+    // MR: Now returns the default pango_context for the widget as GtkGetPangoDefaultContext to
+    // BCI: Remove GtkGetPangoX11Context and m_x11Context completely when symbols may be removed
     PangoContext   *GtkGetPangoX11Context();
-    PangoContext   *m_x11Context;
+    PangoContext   *m_x11Context; // // MR: Now unused
 #endif
 
 #if wxUSE_TOOLTIPS
diff -ur wxWidgets-2.6.1.old/src/gtk/dcclient.cpp wxWidgets-2.6.1.new/src/gtk/dcclient.cpp
--- wxWidgets-2.6.1.old/src/gtk/dcclient.cpp	2005-05-31 20:49:47.000000000 +0000
+++ wxWidgets-2.6.1.new/src/gtk/dcclient.cpp	2005-10-14 17:03:51.471666016 +0000
@@ -1882,10 +1882,13 @@
             PangoContext *oldContext = m_context;
 
             // We might want to use the X11 context for faster
-            // rendering on screen
+            // rendering on screen.
+	    // MR: Lets not want to do this, as this introduces libpangox dependancy.
+#if 0
             if (m_font.GetNoAntiAliasing())
                 m_context = m_owner->GtkGetPangoX11Context();
             else
+#endif
                 m_context = m_owner->GtkGetPangoDefaultContext();
 
             // If we switch back/forth between different contexts
diff -ur wxWidgets-2.6.1.old/src/gtk/window.cpp wxWidgets-2.6.1.new/src/gtk/window.cpp
--- wxWidgets-2.6.1.old/src/gtk/window.cpp	2005-06-02 10:16:50.000000000 +0000
+++ wxWidgets-2.6.1.new/src/gtk/window.cpp	2005-10-14 17:05:15.730856672 +0000
@@ -4279,12 +4279,10 @@
     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 m_x11Context;
+    return gtk_widget_get_pango_context( m_widget );
 }
 #endif