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

Caolán McNamara (via logerrit) logerrit at kemper.freedesktop.org
Wed Sep 29 08:57:14 UTC 2021


 vcl/unx/gtk3/gtkframe.cxx |    4 ++++
 1 file changed, 4 insertions(+)

New commits:
commit 02268b46bcd9535c250be058f295a1c0e8a62965
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Wed Sep 29 08:54:01 2021 +0100
Commit:     Caolán McNamara <caolanm at redhat.com>
CommitDate: Wed Sep 29 10:56:42 2021 +0200

    gtk4: fix build
    
    Change-Id: Ibc4f1d69104cc84279f222743e866381634f799f
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/122795
    Tested-by: Jenkins
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/vcl/unx/gtk3/gtkframe.cxx b/vcl/unx/gtk3/gtkframe.cxx
index 7ac56e361653..7375ca4e9d7c 100644
--- a/vcl/unx/gtk3/gtkframe.cxx
+++ b/vcl/unx/gtk3/gtkframe.cxx
@@ -471,7 +471,9 @@ GtkSalFrame::GtkSalFrame( SalFrame* pParent, SalFrameStyleFlags nStyle )
     , m_pHeaderBar(nullptr)
     , m_bGraphics(false)
     , m_nSetFocusSignalId(0)
+#if !GTK_CHECK_VERSION(4, 0, 0)
     , m_aSmoothScrollIdle("GtkSalFrame m_aSmoothScrollIdle")
+#endif
 {
     getDisplay()->registerFrame( this );
     m_bDefaultPos       = true;
@@ -484,7 +486,9 @@ GtkSalFrame::GtkSalFrame( SystemParentData* pSysData )
     , m_pHeaderBar(nullptr)
     , m_bGraphics(false)
     , m_nSetFocusSignalId(0)
+#if !GTK_CHECK_VERSION(4, 0, 0)
     , m_aSmoothScrollIdle("GtkSalFrame m_aSmoothScrollIdle")
+#endif
 {
     getDisplay()->registerFrame( this );
     // permanently ignore errors from our unruly children ...


More information about the Libreoffice-commits mailing list