From 96befc88c0e1dca9b37a049b619c89a6b9e1d951 Mon Sep 17 00:00:00 2001 From: Paul Cornett Date: Tue, 19 Dec 2017 09:56:23 -0800 Subject: [PATCH] Avoid gtk_tree_view_set_rules_hint() with GTK+4 --- src/gtk/assertdlg_gtk.cpp | 2 ++ src/gtk/dataview.cpp | 5 ++++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/src/gtk/assertdlg_gtk.cpp b/src/gtk/assertdlg_gtk.cpp index ffe6a1353c..3efdc27b13 100644 --- a/src/gtk/assertdlg_gtk.cpp +++ b/src/gtk/assertdlg_gtk.cpp @@ -118,7 +118,9 @@ GtkWidget *gtk_assert_dialog_create_backtrace_list_model () treeview = gtk_tree_view_new_with_model (GTK_TREE_MODEL(store)); g_object_unref (store); #ifndef __WXGTK4__ + wxGCC_WARNING_SUPPRESS(deprecated-declarations) gtk_tree_view_set_rules_hint (GTK_TREE_VIEW (treeview), TRUE); + wxGCC_WARNING_RESTORE() #endif /* append columns */ diff --git a/src/gtk/dataview.cpp b/src/gtk/dataview.cpp index ce16351a86..3683bd3e0e 100644 --- a/src/gtk/dataview.cpp +++ b/src/gtk/dataview.cpp @@ -4627,8 +4627,11 @@ bool wxDataViewCtrl::Create(wxWindow *parent, gtk_tree_view_set_grid_lines( GTK_TREE_VIEW(m_treeview), grid ); } #endif - +#ifndef __WXGTK4__ + wxGCC_WARNING_SUPPRESS(deprecated-declarations) gtk_tree_view_set_rules_hint( GTK_TREE_VIEW(m_treeview), (style & wxDV_ROW_LINES) != 0 ); + wxGCC_WARNING_RESTORE() +#endif gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (m_widget), GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC);