diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2021-05-21 15:22:42 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2021-05-21 20:54:30 +0200 |
| commit | 5c4c3e776d702932099a1d510db0c92d795080ec (patch) | |
| tree | 81d95ad06c697b952b940344fb5c7e19431d9aa2 /vcl/unx | |
| parent | 69ad56b8281bbf4bbf4935cc2ac10b9719869afa (diff) | |
gtk4: reenable Scale
Change-Id: If9ebeb540a87f81bd48a121ecbf674dd8f636f71
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/115941
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'vcl/unx')
| -rw-r--r-- | vcl/unx/gtk3/gtkinst.cxx | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/vcl/unx/gtk3/gtkinst.cxx b/vcl/unx/gtk3/gtkinst.cxx index be00119aa97c..f540885c5ebb 100644 --- a/vcl/unx/gtk3/gtkinst.cxx +++ b/vcl/unx/gtk3/gtkinst.cxx @@ -9981,8 +9981,6 @@ public: namespace { -#if !GTK_CHECK_VERSION(4, 0, 0) - class GtkInstanceScale : public GtkInstanceWidget, public virtual weld::Scale { private: @@ -10055,6 +10053,8 @@ public: } }; +#if !GTK_CHECK_VERSION(4, 0, 0) + class GtkInstanceProgressBar : public GtkInstanceWidget, public virtual weld::ProgressBar { private: @@ -18992,16 +18992,11 @@ public: virtual std::unique_ptr<weld::Scale> weld_scale(const OString &id) override { -#if !GTK_CHECK_VERSION(4, 0, 0) GtkScale* pScale = GTK_SCALE(gtk_builder_get_object(m_pBuilder, id.getStr())); if (!pScale) return nullptr; auto_add_parentless_widgets_to_container(GTK_WIDGET(pScale)); return std::make_unique<GtkInstanceScale>(pScale, this, false); -#else - (void)id; - return nullptr; -#endif } virtual std::unique_ptr<weld::ProgressBar> weld_progress_bar(const OString &id) override |