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

[Caolán McNamara]

 vcl/unx/gtk/gtkinst.cxx |    6 ------
 1 file changed, 6 deletions(-)

New commits:
commit 180a0eac238ce456771ff20b8d3274b43408f54c
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Mon Sep 5 21:55:22 2016 +0100

    use same GtkInstance::AnyInput impl for gtk2 and gtk3
    
    Change-Id: Ib69884e0d02b0b245459eb05d5dfb54797d566ce
    Reviewed-on: https://gerrit.libreoffice.org/28680
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/vcl/unx/gtk/gtkinst.cxx b/vcl/unx/gtk/gtkinst.cxx
index 014ea7c..6f82a22 100644
--- a/vcl/unx/gtk/gtkinst.cxx
+++ b/vcl/unx/gtk/gtkinst.cxx
@@ -119,7 +119,6 @@ extern "C"
     }
 }
 
-#if GTK_CHECK_VERSION(3,0,0)
 static VclInputFlags categorizeEvent(const GdkEvent *pEvent)
 {
     VclInputFlags nType = VclInputFlags::NONE;
@@ -148,7 +147,6 @@ static VclInputFlags categorizeEvent(const GdkEvent *pEvent)
     }
     return nType;
 }
-#endif
 
 GtkInstance::GtkInstance( SalYieldMutex* pMutex )
 #if GTK_CHECK_VERSION(3,0,0)
@@ -437,9 +435,6 @@ bool GtkInstance::AnyInput( VclInputFlags nType )
     EnsureInit();
     if( (nType & VclInputFlags::TIMER) && IsTimerExpired() )
         return true;
-#if !GTK_CHECK_VERSION(3,0,0)
-    bool bRet = X11SalInstance::AnyInput(nType);
-#else
     if (!gdk_events_pending())
         return false;
 
@@ -467,7 +462,6 @@ bool GtkInstance::AnyInput( VclInputFlags nType )
         gdk_event_free(pEvent);
         aEvents.pop();
     }
-#endif
     return bRet;
 }