[Libreoffice-commits] core.git: 2 commits - vcl/unx

[Caolán McNamara (via logerrit)]

 vcl/unx/gtk3/gtkinst.cxx |   13 +------------
 1 file changed, 1 insertion(+), 12 deletions(-)

New commits:
commit c912c4b02b2dc4cd5aa62d77e92e1731c6cbde65
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Fri May 21 15:27:24 2021 +0100
Commit:     Caolán McNamara <caolanm at redhat.com>
CommitDate: Fri May 21 20:55:29 2021 +0200

    gtk4: reenable Spinner
    
    Change-Id: I76eae250038e6c7adc927f1dfc9ff5a926716e15
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/115943
    Tested-by: Jenkins
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>

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
commit fd805bc577d55113db1c9c125e00e4d4bd687e4d
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Fri May 21 15:24:25 2021 +0100
Commit:     Caolán McNamara <caolanm at redhat.com>
CommitDate: Fri May 21 20:55:10 2021 +0200

    gtk4: reenable ProgressBar
    
    Change-Id: I8bf7de16c81de3cd7a978e2c92c59c50a78bb120
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/115942
    Tested-by: Caolán McNamara <caolanm at redhat.com>
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/vcl/unx/gtk3/gtkinst.cxx b/vcl/unx/gtk3/gtkinst.cxx
index f540885c5ebb..ed742d88e3e7 100644
--- a/vcl/unx/gtk3/gtkinst.cxx
+++ b/vcl/unx/gtk3/gtkinst.cxx
@@ -10053,8 +10053,6 @@ public:
     }
 };
 
-#if !GTK_CHECK_VERSION(4, 0, 0)
-
 class GtkInstanceProgressBar : public GtkInstanceWidget, public virtual weld::ProgressBar
 {
 private:
@@ -10085,6 +10083,8 @@ public:
     }
 };
 
+#if !GTK_CHECK_VERSION(4, 0, 0)
+
 class GtkInstanceSpinner : public GtkInstanceWidget, public virtual weld::Spinner
 {
 private:
@@ -19001,16 +19001,11 @@ public:
 
     virtual std::unique_ptr<weld::ProgressBar> weld_progress_bar(const OString &id) override
     {
-#if !GTK_CHECK_VERSION(4, 0, 0)
         GtkProgressBar* pProgressBar = GTK_PROGRESS_BAR(gtk_builder_get_object(m_pBuilder, id.getStr()));
         if (!pProgressBar)
             return nullptr;
         auto_add_parentless_widgets_to_container(GTK_WIDGET(pProgressBar));
         return std::make_unique<GtkInstanceProgressBar>(pProgressBar, this, false);
-#else
-        (void)id;
-        return nullptr;
-#endif
     }
 
     virtual std::unique_ptr<weld::Spinner> weld_spinner(const OString &id) override