[Libreoffice-commits] core.git: vcl/inc vcl/unx

[Caolán McNamara (via logerrit)]

 vcl/inc/unx/gtk/gtkdata.hxx |    1 -
 vcl/unx/gtk3/gtkdata.cxx    |   27 ---------------------------
 2 files changed, 28 deletions(-)

New commits:
commit 919260f73be652195d228d78ed519d46e59e6f8b
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Tue May 11 14:18:39 2021 +0100
Commit:     Caolán McNamara <caolanm at redhat.com>
CommitDate: Tue May 11 16:37:56 2021 +0200

    gtk4: drop no-op filterGdkEvent
    
    Change-Id: Ia94f7f70be9b2ac21608d97095a76624cad78aac
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/115407
    Tested-by: Jenkins
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/vcl/inc/unx/gtk/gtkdata.hxx b/vcl/inc/unx/gtk/gtkdata.hxx
index ddf8a4b63aec..85db523c2caf 100644
--- a/vcl/inc/unx/gtk/gtkdata.hxx
+++ b/vcl/inc/unx/gtk/gtkdata.hxx
@@ -202,7 +202,6 @@ public:
     void startupNotificationCompleted() { m_bStartupCompleted = true; }
 
 #if !GTK_CHECK_VERSION(4,0,0)
-    GdkFilterReturn filterGdkEvent( GdkXEvent* sys_event );
     void screenSizeChanged( GdkScreen const * );
     void monitorsChanged( GdkScreen const * );
 #endif
diff --git a/vcl/unx/gtk3/gtkdata.cxx b/vcl/unx/gtk3/gtkdata.cxx
index 2f0d949f0710..fc2f7df7ce1b 100644
--- a/vcl/unx/gtk3/gtkdata.cxx
+++ b/vcl/unx/gtk3/gtkdata.cxx
@@ -40,24 +40,11 @@
 
 #include <chrono>
 
-
-
 using namespace vcl_sal;
 
-#if !GTK_CHECK_VERSION(4, 0, 0)
 /***************************************************************
  * class GtkSalDisplay                                         *
  ***************************************************************/
-extern "C" {
-static GdkFilterReturn call_filterGdkEvent( GdkXEvent* sys_event,
-                                     GdkEvent* /*event*/,
-                                     gpointer data )
-{
-    GtkSalDisplay *pDisplay = static_cast<GtkSalDisplay *>(data);
-    return pDisplay->filterGdkEvent( sys_event );
-}
-}
-#endif
 
 GtkSalDisplay::GtkSalDisplay( GdkDisplay* pDisplay ) :
             m_pSys( GtkSalSystem::GetSingleton() ),
@@ -67,11 +54,6 @@ GtkSalDisplay::GtkSalDisplay( GdkDisplay* pDisplay ) :
     for(GdkCursor* & rpCsr : m_aCursors)
         rpCsr = nullptr;
 
-#if !GTK_CHECK_VERSION(4, 0, 0)
-    // FIXME: unify this with SalInst's filter too ?
-    gdk_window_add_filter( nullptr, call_filterGdkEvent, this );
-#endif
-
     if ( getenv( "SAL_IGNOREXERRORS" ) )
         GetGenericUnixSalData()->ErrorTrapPush(); // and leak the trap
 
@@ -83,8 +65,6 @@ GtkSalDisplay::GtkSalDisplay( GdkDisplay* pDisplay ) :
 GtkSalDisplay::~GtkSalDisplay()
 {
 #if !GTK_CHECK_VERSION(4, 0, 0)
-    gdk_window_remove_filter( nullptr, call_filterGdkEvent, this );
-
     if( !m_bStartupCompleted )
         gdk_notify_startup_complete();
 
@@ -116,13 +96,6 @@ static void signalMonitorsChanged( GdkScreen* pScreen, gpointer data )
     pDisp->monitorsChanged( pScreen );
 }
 
-GdkFilterReturn GtkSalDisplay::filterGdkEvent( GdkXEvent* )
-{
-    (void) this; // loplugin:staticmethods
-    //FIXME: implement filterGdkEvent ...
-    return GDK_FILTER_CONTINUE;
-}
-
 void GtkSalDisplay::screenSizeChanged( GdkScreen const * pScreen )
 {
     m_pSys->countScreenMonitors();