You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
47 lines
1.8 KiB
47 lines
1.8 KiB
18 years ago
|
# --- T2-COPYRIGHT-NOTE-BEGIN ---
|
||
|
|
# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
|
||
|
|
#
|
||
|
|
# T2 SDE: package/.../wxwidgets24/pango.patch
|
||
|
|
# Copyright (C) 2004 - 2006 The T2 SDE Project
|
||
|
|
#
|
||
|
|
# More information can be found in the files COPYING and README.
|
||
|
|
#
|
||
|
|
# This patch file is dual-licensed. It is available under the license the
|
||
|
|
# patched project is licensed under, as long as it is an OpenSource license
|
||
|
|
# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms
|
||
|
|
# of the GNU General Public License as published by the Free Software
|
||
|
|
# Foundation; either version 2 of the License, or (at your option) any later
|
||
|
|
# version.
|
||
|
|
# --- T2-COPYRIGHT-NOTE-END ---
|
||
|
|
diff -ur wxPythonSrc-2.4.2.4_orig/src/gtk/dcclient.cpp wxPythonSrc-2.4.2.4/src/gtk/dcclient.cpp
|
||
|
|
--- wxPythonSrc-2.4.2.4_orig/src/gtk/dcclient.cpp 2003-04-19 22:22:59.000000000 +0200
|
||
|
|
+++ wxPythonSrc-2.4.2.4/src/gtk/dcclient.cpp 2005-09-11 02:30:52.000000000 +0200
|
||
|
|
@@ -1774,9 +1774,9 @@
|
||
|
|
|
||
|
|
if (m_owner)
|
||
|
|
{
|
||
|
|
- if (m_font.GetNoAntiAliasing())
|
||
|
|
- m_context = m_owner->GtkGetPangoX11Context();
|
||
|
|
- else
|
||
|
|
+ //if (m_font.GetNoAntiAliasing())
|
||
|
|
+ // m_context = m_owner->GtkGetPangoX11Context();
|
||
|
|
+ //else
|
||
|
|
m_context = m_owner->GtkGetPangoDefaultContext();
|
||
|
|
}
|
||
|
|
}
|
||
|
|
diff -ur wxPythonSrc-2.4.2.4_orig/src/gtk/window.cpp wxPythonSrc-2.4.2.4/src/gtk/window.cpp
|
||
|
|
--- wxPythonSrc-2.4.2.4_orig/src/gtk/window.cpp 2003-09-20 00:32:24.000000000 +0200
|
||
|
|
+++ wxPythonSrc-2.4.2.4/src/gtk/window.cpp 2005-09-11 02:32:45.000000000 +0200
|
||
|
|
@@ -4015,10 +4015,7 @@
|
||
|
|
|
||
|
|
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
|
||
|
|
|