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

Caolán McNamara (via logerrit) logerrit at kemper.freedesktop.org
Fri May 28 14:47:30 UTC 2021


 vcl/unx/gtk3/gtkinst.cxx |    4 ----
 1 file changed, 4 deletions(-)

New commits:
commit 572fb7ca5c03a5e2716eb8e3bba727bd96cd3517
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Fri May 28 12:43:07 2021 +0100
Commit:     Caolán McNamara <caolanm at redhat.com>
CommitDate: Fri May 28 16:46:43 2021 +0200

    gtk4: remove some unused ifdefs
    
    Change-Id: I1035efdc3bd19dc04ae81d781d07626be9b6b4fd
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/116331
    Tested-by: Caolán McNamara <caolanm at redhat.com>
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/vcl/unx/gtk3/gtkinst.cxx b/vcl/unx/gtk3/gtkinst.cxx
index 71f271821c5a..cf00e5884063 100644
--- a/vcl/unx/gtk3/gtkinst.cxx
+++ b/vcl/unx/gtk3/gtkinst.cxx
@@ -2575,7 +2575,6 @@ private:
         switch (pEvent->type)
         {
             case GDK_BUTTON_PRESS:
-#if !GTK_CHECK_VERSION(4, 0, 0)
                 if (GdkEvent* pPeekEvent = gdk_event_peek())
                 {
                     bool bSkip = pPeekEvent->type == GDK_2BUTTON_PRESS ||
@@ -2586,11 +2585,9 @@ private:
                         return false;
                     }
                 }
-#endif
                 nEventType = SalEvent::MouseButtonDown;
                 m_nLastMouseClicks = 1;
                 break;
-#if !GTK_CHECK_VERSION(4, 0, 0)
             case GDK_2BUTTON_PRESS:
                 m_nLastMouseClicks = 2;
                 nEventType = SalEvent::MouseButtonDown;
@@ -2599,7 +2596,6 @@ private:
                 m_nLastMouseClicks = 3;
                 nEventType = SalEvent::MouseButtonDown;
                 break;
-#endif
             case GDK_BUTTON_RELEASE:
                 nEventType = SalEvent::MouseButtonUp;
                 break;


More information about the Libreoffice-commits mailing list