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

Caolán McNamara (via logerrit) logerrit at kemper.freedesktop.org
Tue Jun 1 07:44:50 UTC 2021


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

New commits:
commit f1ef0fe2b906188ad5245d04881fb6cc78dad616
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Mon May 31 20:31:28 2021 +0100
Commit:     Caolán McNamara <caolanm at redhat.com>
CommitDate: Tue Jun 1 09:44:07 2021 +0200

    gtk4: restore ComboBox row_separator_func
    
    Change-Id: I1aaa06ca3de9f45e6773ca103570fa06c00df1c1
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/116500
    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 eba28dd66b7c..85bccc59e163 100644
--- a/vcl/unx/gtk3/gtkinst.cxx
+++ b/vcl/unx/gtk3/gtkinst.cxx
@@ -17348,7 +17348,7 @@ private:
     void do_clear()
     {
         disable_notify_events();
-//        gtk_tree_view_set_row_separator_func(m_pTreeView, nullptr, nullptr, nullptr);
+        gtk_combo_box_set_row_separator_func(m_pComboBox, nullptr, nullptr, nullptr);
         m_aSeparatorRows.clear();
         gtk_list_store_clear(GTK_LIST_STORE(m_pTreeModel));
         m_nMRUCount = 0;
@@ -17485,10 +17485,8 @@ private:
     {
         disable_notify_events();
         GtkTreeIter iter;
-#if 0
-        if (!gtk_tree_view_get_row_separator_func(m_pTreeView))
-            gtk_tree_view_set_row_separator_func(m_pTreeView, separatorFunction, this, nullptr);
-#endif
+        if (!gtk_combo_box_get_row_separator_func(m_pComboBox))
+            gtk_combo_box_set_row_separator_func(m_pComboBox, separatorFunction, this, nullptr);
         insert_row(GTK_LIST_STORE(m_pTreeModel), iter, pos, &rId, u"", nullptr, nullptr);
         GtkTreePath* pPath = gtk_tree_path_new_from_indices(pos, -1);
         m_aSeparatorRows.emplace_back(gtk_tree_row_reference_new(m_pTreeModel, pPath));


More information about the Libreoffice-commits mailing list