jean
/
Learning_GTK4_tree
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

WIP: removing deprec : in gtk/gtk.h line 93

This commit is contained in:
Jean Sirmai 2024-01-02 19:50:42 +01:00
parent fde2d4594f
commit 3635308cf5
Signed by: jean
GPG Key ID: FB3115C340E057E3
2 changed files with 31 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

62
demos/gtk-demo/tree_store.c
View File

@ -38,7 +38,7 @@
/* Finds the path at the point (x , y ), relative to bin_window coordinates. Use gtk_tree_view_convert_widget_to_bin_window_coords(). */ /* Finds the path at the point (x , y ), relative to bin_window coordinates. Use gtk_tree_view_convert_widget_to_bin_window_coords(). */
/* https://www.gnu.org/software/guile-gnome/docs/gtk/html/GtkCellRenderer.html */ /* https://www.gnu.org/software/guile-gnome/docs/gtk/html/GtkCellRenderer.html */
/* GtkTreeSelection, GtkTreeView drag-and-drop, GtkTreeSortable, GtkTreeModelSort, GtkCellEditable, GtkCellRendererText,... */ /* GtkTreeSelection, GtkTreeView drag-and-drop, GtkTreeSortable, GtkTreeModelSort, GtkCellEditable, GtkCellRendererText,... */
/* gtk_tree_view_get_search_entry (treeview) */ /* gtk_tree_view_get_search_entry (treeview) https://blog.gtk.org/2020/09/08/on-list-models/ */
/* */ /* */
/****************************************************************************************************************************************/ /****************************************************************************************************************************************/
@ -149,7 +149,7 @@ static TreeItem R[] = {{"A", A}, {"B", B}, {"C", C}, {NULL}};
static TreeItem O[] = {{"ROOT", R}, {NULL}}; // Artefact added for symmetry static TreeItem O[] = {{"ROOT", R}, {NULL}}; // Artefact added for symmetry
static GtkTreeModel *create_node_recursive (GtkTreeStore *model, static GListModel *create_node_recursive (GtkTreeStore *model,
TreeItem *current_item, TreeItem *current_item,
GtkTreeIter *iter_parent, GtkTreeIter *iter_parent,
int depth) int depth)
@ -173,7 +173,7 @@ static GtkTreeModel *create_node_recursive (GtkTreeStore *model,
} }
if (depth == 0) if (depth == 0)
return GTK_TREE_MODEL(model); // cast from GtkTreeModel to GtkTreeStore return G_LIST_MODEL(model); // cast from GtkTreeModel to GListModel or GtkTreeStore
else else
return NULL; return NULL;
} }
@ -187,56 +187,54 @@ do_tree_store (GtkWidget *do_widget)
if (! my_window) if (! my_window)
{ {
GtkWidget *vbox; GtkWidget *my_tree_box;
GtkWidget *sw; // sw : 'scrolled_window' GtkWidget *my_scrolled_window;
GtkWidget *treeview; GtkWidget *my_tree_view;
GtkTreeModel *my_tree_model; // TODO replace by : GListModel *my_list_model; GListModel *my_list_model = NULL;
GtkTreeStore *my_tree_store = NULL; // TODO replace by : GtkTreeListModel *my_tree_list_model;
// https://docs.gtk.org/gio/property.ListStore.n-items.html
/* create window, etc */ /* create window, etc */
my_window = gtk_window_new (); my_window = gtk_window_new ();
gtk_window_set_title (GTK_WINDOW (my_window), "Tree Store"); gtk_window_set_title (GTK_WINDOW (my_window), "Tree Store");
g_object_add_weak_pointer (G_OBJECT (my_window), (gpointer *)&my_window); g_object_add_weak_pointer (G_OBJECT (my_window), (gpointer *)&my_window);
vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 8); my_tree_box = gtk_box_new (GTK_ORIENTATION_VERTICAL, 8);
gtk_widget_set_margin_start (vbox, 8); gtk_widget_set_margin_start (my_tree_box, 8);
gtk_widget_set_margin_end (vbox, 8); gtk_widget_set_margin_end (my_tree_box, 8);
gtk_widget_set_margin_top (vbox, 8); gtk_widget_set_margin_top (my_tree_box, 8);
gtk_widget_set_margin_bottom (vbox, 8); gtk_widget_set_margin_bottom (my_tree_box, 8);
gtk_window_set_child (GTK_WINDOW (my_window), vbox); gtk_window_set_child (GTK_WINDOW (my_window), my_tree_box);
gtk_box_append (GTK_BOX (vbox), gtk_label_new ("Learning GTK trees")); gtk_box_append (GTK_BOX (my_tree_box), gtk_label_new ("Learning GTK trees"));
sw = gtk_scrolled_window_new (); my_scrolled_window = gtk_scrolled_window_new ();
gtk_scrolled_window_set_has_frame (GTK_SCROLLED_WINDOW (sw), TRUE); gtk_scrolled_window_set_has_frame (GTK_SCROLLED_WINDOW (my_scrolled_window), TRUE);
gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (sw), gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (my_scrolled_window),
GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC,
GTK_POLICY_AUTOMATIC); GTK_POLICY_AUTOMATIC);
gtk_box_append (GTK_BOX (vbox), sw); gtk_box_append (GTK_BOX (my_tree_box), my_scrolled_window);
/* create tree_model */ /* create tree_model */
my_tree_model = create_node_recursive (my_tree_store, O, NULL, 0); my_list_model = create_node_recursive (my_list_model, O, NULL, 0);
/* create tree view */ /* create tree view */
treeview = gtk_tree_view_new_with_model (my_tree_model); my_tree_view = gtk_tree_view_new_with_model (my_list_model);
gtk_tree_view_set_headers_visible (GTK_TREE_VIEW (treeview), FALSE); gtk_tree_view_set_headers_visible (GTK_TREE_VIEW (my_tree_view), FALSE);
gtk_tree_view_set_enable_tree_lines (GTK_TREE_VIEW (treeview), TRUE); gtk_tree_view_set_enable_tree_lines (GTK_TREE_VIEW (my_tree_view), TRUE);
gtk_widget_set_vexpand (treeview, TRUE); gtk_widget_set_vexpand (my_tree_view, TRUE);
gtk_tree_selection_set_mode (gtk_tree_view_get_selection (GTK_TREE_VIEW (treeview)), gtk_tree_selection_set_mode (gtk_tree_view_get_selection (GTK_TREE_VIEW (my_tree_view)),
GTK_SELECTION_MULTIPLE); GTK_SELECTION_MULTIPLE);
gtk_tree_view_set_reorderable (GTK_TREE_VIEW (treeview), TRUE); gtk_tree_view_set_reorderable (GTK_TREE_VIEW (my_tree_view), TRUE);
g_object_unref (my_tree_model); g_object_unref (my_list_model);
GtkCellRenderer *renderer; GtkCellRenderer *renderer;
renderer = gtk_cell_renderer_text_new (); g_object_set (renderer, "xalign", 0.0, NULL); renderer = gtk_cell_renderer_text_new (); g_object_set (renderer, "xalign", 0.0, NULL);
gtk_tree_view_insert_column_with_attributes (GTK_TREE_VIEW (treeview), -1, gtk_tree_view_insert_column_with_attributes (GTK_TREE_VIEW (my_tree_view), -1,
"Col 0", renderer, "text", STRING_COLUMN, NULL); "Col 0", renderer, "text", STRING_COLUMN, NULL);
gtk_scrolled_window_set_child (GTK_SCROLLED_WINDOW (sw), treeview); gtk_scrolled_window_set_child (GTK_SCROLLED_WINDOW (my_scrolled_window), my_tree_view);
/* expand all rows after the treeview widget has been realized */ /* expand all rows after the my_tree_view widget has been realized */
g_signal_connect (treeview, "realize", g_signal_connect (my_tree_view, "realize",
G_CALLBACK (gtk_tree_view_expand_all), NULL); G_CALLBACK (gtk_tree_view_expand_all), NULL);
gtk_window_set_default_size (GTK_WINDOW (my_window), 200, 400); gtk_window_set_default_size (GTK_WINDOW (my_window), 200, 400);
} }

2
gtk/gtk.h
View File

@ -90,7 +90,7 @@
#include <gtk/gtkcolumnviewcolumn.h> #include <gtk/gtkcolumnviewcolumn.h>
#include <gtk/gtkcolumnviewrow.h> #include <gtk/gtkcolumnviewrow.h>
#include <gtk/gtkcolumnviewsorter.h> #include <gtk/gtkcolumnviewsorter.h>
#include <gtk/deprecated/gtkcombobox.h> //#include <gtk/deprecated/gtkcombobox.h>
#include <gtk/deprecated/gtkcomboboxtext.h> #include <gtk/deprecated/gtkcomboboxtext.h>
#include <gtk/gtkconstraintlayout.h> #include <gtk/gtkconstraintlayout.h>
#include <gtk/gtkconstraint.h> #include <gtk/gtkconstraint.h>