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

[Caolán McNamara (via logerrit)]

 vcl/unx/gtk3/gtkinst.cxx |   14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

New commits:
commit 17546fa4f630bccd92e438b613014982a8d9fc03
Author:     Caolán McNamara <caol...@redhat.com>
AuthorDate: Wed Mar 9 11:43:37 2022 +0000
Commit:     Caolán McNamara <caol...@redhat.com>
CommitDate: Wed Mar 9 14:47:06 2022 +0100

    gtk4: use new mechanisms to set a11y description and label/name
    
    Change-Id: I08ffd80f53e6360ddc2093523333b90ddedad294
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/131239
    Tested-by: Caolán McNamara <caol...@redhat.com>
    Reviewed-by: Caolán McNamara <caol...@redhat.com>

diff --git a/vcl/unx/gtk3/gtkinst.cxx b/vcl/unx/gtk3/gtkinst.cxx
index b0566791d4f1..2d4397d43d9e 100644
--- a/vcl/unx/gtk3/gtkinst.cxx
+++ b/vcl/unx/gtk3/gtkinst.cxx
@@ -3716,25 +3716,27 @@ public:
 
     virtual void set_accessible_name(const OUString& rName) override
     {
-#if !GTK_CHECK_VERSION(4, 0, 0)
+#if GTK_CHECK_VERSION(4, 0, 0)
+        gtk_accessible_update_property(GTK_ACCESSIBLE(m_pWidget), 
GTK_ACCESSIBLE_PROPERTY_LABEL,
+                                       OUStringToOString(rName, 
RTL_TEXTENCODING_UTF8).getStr(), -1);
+#else
         AtkObject* pAtkObject = gtk_widget_get_accessible(m_pWidget);
         if (!pAtkObject)
             return;
         atk_object_set_name(pAtkObject, OUStringToOString(rName, 
RTL_TEXTENCODING_UTF8).getStr());
-#else
-        (void)rName;
 #endif
     }
 
     virtual void set_accessible_description(const OUString& rDescription) 
override
     {
-#if !GTK_CHECK_VERSION(4, 0, 0)
+#if GTK_CHECK_VERSION(4, 0, 0)
+        gtk_accessible_update_property(GTK_ACCESSIBLE(m_pWidget), 
GTK_ACCESSIBLE_PROPERTY_DESCRIPTION,
+                                       OUStringToOString(rDescription, 
RTL_TEXTENCODING_UTF8).getStr(), -1);
+#else
         AtkObject* pAtkObject = gtk_widget_get_accessible(m_pWidget);
         if (!pAtkObject)
             return;
         atk_object_set_description(pAtkObject, OUStringToOString(rDescription, 
RTL_TEXTENCODING_UTF8).getStr());
-#else
-        (void)rDescription;
 #endif
     }