vcl/unx/gtk3/gtkinst.cxx | 9 ++-------
1 file changed, 2 insertions(+), 7 deletions(-)
New commits:
commit 5c4c3e776d702932099a1d510db0c92d795080ec
Author: Caolán McNamara <caol...@redhat.com>
AuthorDate: Fri May 21 15:22:42 2021 +0100
Commit: Caolán McNamara <caol...@redhat.com>
CommitDate: Fri May 21 20:54:30 2021 +0200
gtk4: reenable Scale
Change-Id: If9ebeb540a87f81bd48a121ecbf674dd8f636f71
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/115941
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caol...@redhat.com>
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
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
