Attachment #70670 for bug #105189

Lines 167-174 Link Here

(-)wxWidgets-2.6.1.old/include/wx/gtk/window.h (-1 / +3 lines)
167	// Returns the X11 context which renders on the X11 client	167	// Returns the X11 context which renders on the X11 client
168	// side (which can be remote) and which usually is not	168	// side (which can be remote) and which usually is not
169	// anti-aliased and is thus faster	169	// anti-aliased and is thus faster
		170	// MR: Now returns the default pango_context for the widget as GtkGetPangoDefaultContext to
		171	// BCI: Remove GtkGetPangoX11Context and m_x11Context completely when symbols may be removed
170	PangoContext *GtkGetPangoX11Context();	172	PangoContext *GtkGetPangoX11Context();
171	PangoContext *m_x11Context;	173	PangoContext *m_x11Context; // // MR: Now unused
172	#endif	174	#endif
173		175
174	#if wxUSE_TOOLTIPS	176	#if wxUSE_TOOLTIPS

Lines 1882-1891 Link Here

(-)wxWidgets-2.6.1.old/src/gtk/dcclient.cpp (-1 / +4 lines)
1882	PangoContext *oldContext = m_context;	1882	PangoContext *oldContext = m_context;
1883		1883
1884	// We might want to use the X11 context for faster	1884	// We might want to use the X11 context for faster
1885	// rendering on screen	1885	// rendering on screen.
		1886	// MR: Lets not want to do this, as this introduces libpangox dependancy.
		1887	#if 0
1886	if (m_font.GetNoAntiAliasing())	1888	if (m_font.GetNoAntiAliasing())
1887	m_context = m_owner->GtkGetPangoX11Context();	1889	m_context = m_owner->GtkGetPangoX11Context();
1888	else	1890	else
		1891	#endif
1889	m_context = m_owner->GtkGetPangoDefaultContext();	1892	m_context = m_owner->GtkGetPangoDefaultContext();
1890		1893
1891	// If we switch back/forth between different contexts	1894	// If we switch back/forth between different contexts




    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()
{
    return gtk_widget_get_pango_context( m_widget );
        m_x11Context = pango_x_get_context( gdk_display );

    return m_x11Context;
}
#endif
 

Return to bug 105189

Lines 4279-4290 Link Here

(-)wxWidgets-2.6.1.old/src/gtk/window.cpp (-4 / +2 lines)
4279	return gtk_widget_get_pango_context( m_widget );	4279	return gtk_widget_get_pango_context( m_widget );
4280	}	4280	}
4281		4281
		4282	// MR: Returns the same as GtkGetPangoDefaultContext until the symbol can be removed in 2.7.x
4282	PangoContext *wxWindowGTK::GtkGetPangoX11Context()	4283	PangoContext *wxWindowGTK::GtkGetPangoX11Context()
4283	{	4284	{
4284	if (!m_x11Context)	4285	return gtk_widget_get_pango_context( m_widget );
4285	m_x11Context = pango_x_get_context( gdk_display );
4286
4287	return m_x11Context;
4288	}	4286	}
4289	#endif	4287	#endif
4290		4288