diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2021-05-21 15:27:24 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2021-05-21 20:55:29 +0200 |
| commit | c912c4b02b2dc4cd5aa62d77e92e1731c6cbde65 (patch) | |
| tree | 7abfc851de3265bfac6de93e864fdb1403b12927 | |
| parent | fd805bc577d55113db1c9c125e00e4d4bd687e4d (diff) | |
gtk4: reenable Spinner
Change-Id: I76eae250038e6c7adc927f1dfc9ff5a926716e15
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/115943
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
| -rw-r--r-- | vcl/unx/gtk3/gtkinst.cxx | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/vcl/unx/gtk3/gtkinst.cxx b/vcl/unx/gtk3/gtkinst.cxx index ed742d88e3e7..361dfa745de1 100644 --- a/vcl/unx/gtk3/gtkinst.cxx +++ b/vcl/unx/gtk3/gtkinst.cxx @@ -10083,8 +10083,6 @@ public: } }; -#if !GTK_CHECK_VERSION(4, 0, 0) - class GtkInstanceSpinner : public GtkInstanceWidget, public virtual weld::Spinner { private: @@ -10108,6 +10106,7 @@ public: } }; +#if !GTK_CHECK_VERSION(4, 0, 0) class GtkInstanceImage : public GtkInstanceWidget, public virtual weld::Image { private: @@ -19010,16 +19009,11 @@ public: virtual std::unique_ptr<weld::Spinner> weld_spinner(const OString &id) override { -#if !GTK_CHECK_VERSION(4, 0, 0) GtkSpinner* pSpinner = GTK_SPINNER(gtk_builder_get_object(m_pBuilder, id.getStr())); if (!pSpinner) return nullptr; auto_add_parentless_widgets_to_container(GTK_WIDGET(pSpinner)); return std::make_unique<GtkInstanceSpinner>(pSpinner, this, false); -#else - (void)id; - return nullptr; -#endif } virtual std::unique_ptr<weld::Image> weld_image(const OString &id) override |