Allow wx parents a chance to handle events fired by non-wx children. (i.e. wxActiveX...

[wxWidgets.git] / src / gtk / window.cpp

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)