Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove my binary compatibility stuff from HEAD. Patch #1367014 used for reference.

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36378 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Mart Raudsepp
2005-12-13 02:46:20 +00:00
parent 8180d40b1f
commit b16de7461a
6 changed files with 0 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
include/wx/gtk/window.h
View File

@@ -163,15 +163,6 @@ public:
#ifdef __WXGTK20__ #ifdef __WXGTK20__
// Returns the default context which usually is anti-aliased // Returns the default context which usually is anti-aliased
PangoContext *GtkGetPangoDefaultContext(); PangoContext *GtkGetPangoDefaultContext();
// 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
// not depend on libpangox - which is completely deprecated.
//BCI: Remove GtkGetPangoX11Context and m_x11Context completely when symbols may be removed
PangoContext *GtkGetPangoX11Context();
PangoContext *m_x11Context; // MR: Now unused
#endif #endif
#if wxUSE_TOOLTIPS #if wxUSE_TOOLTIPS

9
include/wx/gtk1/window.h
View File

@@ -163,15 +163,6 @@ public:
#ifdef __WXGTK20__ #ifdef __WXGTK20__
// Returns the default context which usually is anti-aliased // Returns the default context which usually is anti-aliased
PangoContext *GtkGetPangoDefaultContext(); PangoContext *GtkGetPangoDefaultContext();
// 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
// not depend on libpangox - which is completely deprecated.
//BCI: Remove GtkGetPangoX11Context and m_x11Context completely when symbols may be removed
PangoContext *GtkGetPangoX11Context();
PangoContext *m_x11Context; // MR: Now unused
#endif #endif
#if wxUSE_TOOLTIPS #if wxUSE_TOOLTIPS

8
src/gtk/dcclient.cpp
View File

@@ -1883,14 +1883,6 @@ void wxWindowDC::SetFont( const wxFont &font )
{ {
PangoContext *oldContext = m_context; PangoContext *oldContext = m_context;
// We might want to use the X11 context for faster
// 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(); m_context = m_owner->GtkGetPangoDefaultContext();
// If we switch back/forth between different contexts // If we switch back/forth between different contexts

7
src/gtk/window.cpp
View File

@@ -2730,7 +2730,6 @@ void wxWindowGTK::Init()
#ifdef __WXGTK20__ #ifdef __WXGTK20__
m_imData = NULL; m_imData = NULL;
m_x11Context = NULL;
m_dirtyTabOrder = false; m_dirtyTabOrder = false;
#else #else
#ifdef HAVE_XIM #ifdef HAVE_XIM
@@ -4287,12 +4286,6 @@ PangoContext *wxWindowGTK::GtkGetPangoDefaultContext()
{ {
return gtk_widget_get_pango_context( m_widget ); 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 );
}
#endif #endif
GtkRcStyle *wxWindowGTK::CreateWidgetStyle(bool forceStyle) GtkRcStyle *wxWindowGTK::CreateWidgetStyle(bool forceStyle)

8
src/gtk1/dcclient.cpp
View File

@@ -1883,14 +1883,6 @@ void wxWindowDC::SetFont( const wxFont &font )
{ {
PangoContext *oldContext = m_context; PangoContext *oldContext = m_context;
// We might want to use the X11 context for faster
// 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(); m_context = m_owner->GtkGetPangoDefaultContext();
// If we switch back/forth between different contexts // If we switch back/forth between different contexts

7
src/gtk1/window.cpp
View File

@@ -2730,7 +2730,6 @@ void wxWindowGTK::Init()
#ifdef __WXGTK20__ #ifdef __WXGTK20__
m_imData = NULL; m_imData = NULL;
m_x11Context = NULL;
m_dirtyTabOrder = false; m_dirtyTabOrder = false;
#else #else
#ifdef HAVE_XIM #ifdef HAVE_XIM
@@ -4287,12 +4286,6 @@ PangoContext *wxWindowGTK::GtkGetPangoDefaultContext()
{ {
return gtk_widget_get_pango_context( m_widget ); 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 );
}
#endif #endif
GtkRcStyle *wxWindowGTK::CreateWidgetStyle(bool forceStyle) GtkRcStyle *wxWindowGTK::CreateWidgetStyle(bool forceStyle)