diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2021-05-21 15:20:45 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2021-05-21 20:54:09 +0200 |
| commit | 69ad56b8281bbf4bbf4935cc2ac10b9719869afa (patch) | |
| tree | dcec6efdad6392abee528de6d74a1ff480f60a80 | |
| parent | 4cd4946b7c04e192d2f2fa164eae87224f4d0b5d (diff) | |
gtk4: renable LinkButton
Change-Id: Ifdb49a52c08ac78a48aa37c00041b8714bcd0206
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/115940
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
| -rw-r--r-- | vcl/unx/gtk3/gtkinst.cxx | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/vcl/unx/gtk3/gtkinst.cxx b/vcl/unx/gtk3/gtkinst.cxx index 56d05b1dc6aa..be00119aa97c 100644 --- a/vcl/unx/gtk3/gtkinst.cxx +++ b/vcl/unx/gtk3/gtkinst.cxx @@ -9789,6 +9789,12 @@ public: } }; +} + +#endif + +namespace { + class GtkInstanceLinkButton : public GtkInstanceWidget, public virtual weld::LinkButton { private: @@ -9851,8 +9857,6 @@ public: } -#endif - namespace { class GtkInstanceCheckButton : public GtkInstanceWidget, public virtual weld::CheckButton @@ -18948,16 +18952,11 @@ public: virtual std::unique_ptr<weld::LinkButton> weld_link_button(const OString &id) override { -#if !GTK_CHECK_VERSION(4, 0, 0) GtkLinkButton* pButton = GTK_LINK_BUTTON(gtk_builder_get_object(m_pBuilder, id.getStr())); if (!pButton) return nullptr; auto_add_parentless_widgets_to_container(GTK_WIDGET(pButton)); return std::make_unique<GtkInstanceLinkButton>(pButton, this, false); -#else - (void)id; - return nullptr; -#endif } virtual std::unique_ptr<weld::ToggleButton> weld_toggle_button(const OString &id) override |