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

[Caolán McNamara (via logerrit)]

 vcl/unx/gtk3/gtkinst.cxx |   18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

New commits:
commit b55389c7c1bff6b555e14a3cef570fcb85091e4d
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Wed Jul 7 15:09:23 2021 +0100
Commit:     Caolán McNamara <caolanm at redhat.com>
CommitDate: Wed Jul 7 17:38:05 2021 +0200

    gtk[3|4] give signal_item_activate an ident instead of a GtkMenuItem*
    
    Change-Id: I9f762dea7f2a8daadfbe4ee693caf5a40442aabe
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/118573
    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 e93d8e29e5bc..c5bc9657f309 100644
--- a/vcl/unx/gtk3/gtkinst.cxx
+++ b/vcl/unx/gtk3/gtkinst.cxx
@@ -4789,10 +4789,10 @@ private:
     {
         MenuHelper* pThis = static_cast<MenuHelper*>(widget);
         SolarMutexGuard aGuard;
-        pThis->signal_item_activate(pItem);
+        pThis->signal_item_activate(::get_buildable_id(GTK_BUILDABLE(pItem)));
     }
 
-    virtual void signal_item_activate(GtkMenuItem* pItem) = 0;
+    virtual void signal_item_activate(const OString& rIdent) = 0;
 #else
     static std::pair<GMenuModel*, int> find_id(GMenuModel* pMenuModel, const OString& rId)
     {
@@ -9835,9 +9835,9 @@ public:
         pThis->signal_selected(aStr);
     }
 #else
-    virtual void signal_item_activate(GtkMenuItem* pItem) override
+    virtual void signal_item_activate(const OString& rIdent) override
     {
-        signal_selected(::get_buildable_id(GTK_BUILDABLE(pItem)));
+        signal_selected(rIdent);
     }
 #endif
 
@@ -10200,9 +10200,9 @@ public:
         MenuHelper::set_item_visible(rIdent, bVisible);
     }
 
-    virtual void signal_item_activate(GtkMenuItem* pItem) override
+    virtual void signal_item_activate(const OString& rIdent) override
     {
-        signal_selected(::get_buildable_id(GTK_BUILDABLE(pItem)));
+        signal_selected(rIdent);
     }
 
     virtual void set_popover(weld::Widget* /*pPopover*/) override
@@ -10225,9 +10225,9 @@ protected:
 
 private:
 #if !GTK_CHECK_VERSION(4, 0, 0)
-    virtual void signal_item_activate(GtkMenuItem* pItem) override
+    virtual void signal_item_activate(const OString& rIdent) override
     {
-        m_sActivated = ::get_buildable_id(GTK_BUILDABLE(pItem));
+        m_sActivated = rIdent;
         weld::Menu::signal_activate(m_sActivated);
     }
 
@@ -17275,7 +17275,7 @@ public:
         , m_pComboBox(pComboBox)
     {
     }
-    virtual void signal_item_activate(GtkMenuItem*) override
+    virtual void signal_item_activate(const OString& /*rIdent*/) override
     {
         gtk_toggle_button_set_active(m_pComboBox, false);
     }
commit dc2abe4646cbf1c867a0ecc75bcb4e6c7d1fb806
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Wed Jul 7 15:02:11 2021 +0100
Commit:     Caolán McNamara <caolanm at redhat.com>
CommitDate: Wed Jul 7 17:37:49 2021 +0200

    gtk[3|4] rename signal_activate to signal_item_activate
    
    Change-Id: Ic90bd9f87bfdb8e7de6d5546ea1f8c33236e6469
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/118572
    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 fadfaab17d87..e93d8e29e5bc 100644
--- a/vcl/unx/gtk3/gtkinst.cxx
+++ b/vcl/unx/gtk3/gtkinst.cxx
@@ -4789,10 +4789,10 @@ private:
     {
         MenuHelper* pThis = static_cast<MenuHelper*>(widget);
         SolarMutexGuard aGuard;
-        pThis->signal_activate(pItem);
+        pThis->signal_item_activate(pItem);
     }
 
-    virtual void signal_activate(GtkMenuItem* pItem) = 0;
+    virtual void signal_item_activate(GtkMenuItem* pItem) = 0;
 #else
     static std::pair<GMenuModel*, int> find_id(GMenuModel* pMenuModel, const OString& rId)
     {
@@ -9835,7 +9835,7 @@ public:
         pThis->signal_selected(aStr);
     }
 #else
-    virtual void signal_activate(GtkMenuItem* pItem) override
+    virtual void signal_item_activate(GtkMenuItem* pItem) override
     {
         signal_selected(::get_buildable_id(GTK_BUILDABLE(pItem)));
     }
@@ -10200,7 +10200,7 @@ public:
         MenuHelper::set_item_visible(rIdent, bVisible);
     }
 
-    virtual void signal_activate(GtkMenuItem* pItem) override
+    virtual void signal_item_activate(GtkMenuItem* pItem) override
     {
         signal_selected(::get_buildable_id(GTK_BUILDABLE(pItem)));
     }
@@ -10225,7 +10225,7 @@ protected:
 
 private:
 #if !GTK_CHECK_VERSION(4, 0, 0)
-    virtual void signal_activate(GtkMenuItem* pItem) override
+    virtual void signal_item_activate(GtkMenuItem* pItem) override
     {
         m_sActivated = ::get_buildable_id(GTK_BUILDABLE(pItem));
         weld::Menu::signal_activate(m_sActivated);
@@ -17275,7 +17275,7 @@ public:
         , m_pComboBox(pComboBox)
     {
     }
-    virtual void signal_activate(GtkMenuItem*) override
+    virtual void signal_item_activate(GtkMenuItem*) override
     {
         gtk_toggle_button_set_active(m_pComboBox, false);
     }