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

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36378 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/include/wx/gtk/window.h b/include/wx/gtk/window.h
index 57a87ada570d0abf229c0a30dff249257717af4a..e3ea31dc2f88faef943ec84611537f3fde6b7899 100644 (file)
--- a/include/wx/gtk/window.h
+++ b/include/wx/gtk/window.h
@@ -163,15 +163,6 @@ public:
 #ifdef __WXGTK20__
     // Returns the default context which usually is anti-aliased
     PangoContext   *GtkGetPangoDefaultContext();
 #ifdef __WXGTK20__
     // Returns the default context which usually is anti-aliased
     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
 
 #if wxUSE_TOOLTIPS
 #endif
 
 #if wxUSE_TOOLTIPS

diff --git a/include/wx/gtk1/window.h b/include/wx/gtk1/window.h
index 57a87ada570d0abf229c0a30dff249257717af4a..e3ea31dc2f88faef943ec84611537f3fde6b7899 100644 (file)
--- a/include/wx/gtk1/window.h
+++ b/include/wx/gtk1/window.h
@@ -163,15 +163,6 @@ public:
 #ifdef __WXGTK20__
     // Returns the default context which usually is anti-aliased
     PangoContext   *GtkGetPangoDefaultContext();
 #ifdef __WXGTK20__
     // Returns the default context which usually is anti-aliased
     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
 
 #if wxUSE_TOOLTIPS
 #endif
 
 #if wxUSE_TOOLTIPS

diff --git a/src/gtk/dcclient.cpp b/src/gtk/dcclient.cpp
index bf324de310ad87754484ab0b45dc13ceaed6b76b..5dabb7b244441dc3c79e0d2c89f41f8479700ed5 100644 (file)
--- a/src/gtk/dcclient.cpp
+++ b/src/gtk/dcclient.cpp
@@ -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();
 
             // If we switch back/forth between different contexts
             m_context = m_owner->GtkGetPangoDefaultContext();
 
             // If we switch back/forth between different contexts

diff --git a/src/gtk/window.cpp b/src/gtk/window.cpp
index 9c1a4fecb32280c1f6e7edf619f99fe0ab77018c..8cfcee38f189204b65afc9daddc4e0cb3b58620c 100644 (file)
--- a/src/gtk/window.cpp
+++ b/src/gtk/window.cpp
@@ -2730,7 +2730,6 @@ void wxWindowGTK::Init()
 
 #ifdef __WXGTK20__
     m_imData = NULL;
 
 #ifdef __WXGTK20__
     m_imData = NULL;

-    m_x11Context = NULL;

     m_dirtyTabOrder = false;
 #else
 #ifdef HAVE_XIM
     m_dirtyTabOrder = false;
 #else
 #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
 
 GtkRcStyle *wxWindowGTK::CreateWidgetStyle(bool forceStyle)
 #endif
 
 GtkRcStyle *wxWindowGTK::CreateWidgetStyle(bool forceStyle)

diff --git a/src/gtk1/dcclient.cpp b/src/gtk1/dcclient.cpp
index bf324de310ad87754484ab0b45dc13ceaed6b76b..5dabb7b244441dc3c79e0d2c89f41f8479700ed5 100644 (file)
--- a/src/gtk1/dcclient.cpp
+++ b/src/gtk1/dcclient.cpp
@@ -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();
 
             // If we switch back/forth between different contexts
             m_context = m_owner->GtkGetPangoDefaultContext();
 
             // If we switch back/forth between different contexts

diff --git a/src/gtk1/window.cpp b/src/gtk1/window.cpp
index 9c1a4fecb32280c1f6e7edf619f99fe0ab77018c..8cfcee38f189204b65afc9daddc4e0cb3b58620c 100644 (file)
--- a/src/gtk1/window.cpp
+++ b/src/gtk1/window.cpp
@@ -2730,7 +2730,6 @@ void wxWindowGTK::Init()
 
 #ifdef __WXGTK20__
     m_imData = NULL;
 
 #ifdef __WXGTK20__
     m_imData = NULL;

-    m_x11Context = NULL;

     m_dirtyTabOrder = false;
 #else
 #ifdef HAVE_XIM
     m_dirtyTabOrder = false;
 #else
 #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
 
 GtkRcStyle *wxWindowGTK::CreateWidgetStyle(bool forceStyle)
 #endif
 
 GtkRcStyle *wxWindowGTK::CreateWidgetStyle(bool forceStyle)