From 948066dba3556598337b3b5db75f77439627f94f Mon Sep 17 00:00:00 2001
From: Caolán McNamara <caolanm@redhat.com>
Date: Tue, 11 May 2021 12:24:48 +0100
Subject: gtk4: enable svg pointer cursors
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Change-Id: I15086c16733b862dfea7dc9be621a527000b97cf
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/115398
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
---
 vcl/unx/gtk3/gtkdata.cxx | 5 -----
 vcl/unx/gtk3/gtkinst.cxx | 2 ++
 2 files changed, 2 insertions(+), 5 deletions(-)

(limited to 'vcl')

diff --git a/vcl/unx/gtk3/gtkdata.cxx b/vcl/unx/gtk3/gtkdata.cxx
index eb534b0d42e6..a30e4df0b853 100644
--- a/vcl/unx/gtk3/gtkdata.cxx
+++ b/vcl/unx/gtk3/gtkdata.cxx
@@ -135,12 +135,7 @@ void GtkSalDisplay::monitorsChanged( GdkScreen const * pScreen )
 
 GdkCursor* GtkSalDisplay::getFromSvg(OUString const & name, int nXHot, int nYHot)
 {
-#if !GTK_CHECK_VERSION(4, 0, 0)
     GdkPixbuf* pPixBuf = load_icon_by_name(name);
-#else
-    (void)name;
-    GdkPixbuf* pPixBuf = nullptr;
-#endif
     assert(pPixBuf && "missing image?");
     if (!pPixBuf)
         return nullptr;
diff --git a/vcl/unx/gtk3/gtkinst.cxx b/vcl/unx/gtk3/gtkinst.cxx
index b8ddee717811..3f15bf1f9fe0 100644
--- a/vcl/unx/gtk3/gtkinst.cxx
+++ b/vcl/unx/gtk3/gtkinst.cxx
@@ -3665,6 +3665,7 @@ namespace
         return OUString(pText, pText ? strlen(pText) : 0, RTL_TEXTENCODING_UTF8);
     }
 }
+#endif
 
 namespace
 {
@@ -3702,6 +3703,7 @@ GdkPixbuf* load_icon_by_name(const OUString& rIconName)
     return load_icon_by_name_theme_lang(rIconName, sIconTheme, sUILang);
 }
 
+#if !GTK_CHECK_VERSION(4, 0, 0)
 namespace
 {
     GdkPixbuf* getPixbuf(const css::uno::Reference<css::graphic::XGraphic>& rImage)
-- 
cgit