diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2021-05-11 12:24:48 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2021-05-11 14:40:34 +0200 |
| commit | 948066dba3556598337b3b5db75f77439627f94f (patch) | |
| tree | d5b996c0821a89d158a219c4e3a1ec12d2559809 /vcl | |
| parent | 31d3f7c7e571acbce0b4da98e6a240ecdc8ea014 (diff) | |
gtk4: enable svg pointer cursors
Change-Id: I15086c16733b862dfea7dc9be621a527000b97cf
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/115398
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'vcl')
| -rw-r--r-- | vcl/unx/gtk3/gtkdata.cxx | 5 | ||||
| -rw-r--r-- | vcl/unx/gtk3/gtkinst.cxx | 2 |
2 files changed, 2 insertions, 5 deletions
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) |