examples: Update per new APIs

Author: bilelmoussaoui

examples/list_store/main.rs

@@ -232,9 +232,9 @@ fn add_columns(model: &Rc<gtk::ListStore>, treeview: &gtk::TreeView) {
         let model_clone = model.clone();
         renderer.connect_toggled(move |w, path| fixed_toggled(&model_clone, w, path));
         let column = gtk::TreeViewColumn::new();
-        column.pack_start(&renderer, true);
+        TreeViewColumnExt::pack_start(&column, &renderer, true);
         column.set_title("Fixed?");
-        column.add_attribute(&renderer, "active", Columns::Fixed as i32);
+        TreeViewColumnExt::add_attribute(&column, &renderer, "active", Columns::Fixed as i32);
         column.set_sizing(gtk::TreeViewColumnSizing::Fixed);
         column.set_fixed_width(50);
         treeview.append_column(&column);
@@ -244,9 +244,9 @@ fn add_columns(model: &Rc<gtk::ListStore>, treeview: &gtk::TreeView) {
     {
         let renderer = gtk::CellRendererText::new();
         let column = gtk::TreeViewColumn::new();
-        column.pack_start(&renderer, true);
+        TreeViewColumnExt::pack_start(&column, &renderer, true);
         column.set_title("Bug number");
-        column.add_attribute(&renderer, "text", Columns::Number as i32);
+        TreeViewColumnExt::add_attribute(&column, &renderer, "text", Columns::Number as i32);
         column.set_sort_column_id(Columns::Number as i32);
         treeview.append_column(&column);
     }
@@ -255,9 +255,9 @@ fn add_columns(model: &Rc<gtk::ListStore>, treeview: &gtk::TreeView) {
     {
         let renderer = gtk::CellRendererText::new();
         let column = gtk::TreeViewColumn::new();
-        column.pack_start(&renderer, true);
+        TreeViewColumnExt::pack_start(&column, &renderer, true);
         column.set_title("Severity");
-        column.add_attribute(&renderer, "text", Columns::Severity as i32);
+        TreeViewColumnExt::add_attribute(&column, &renderer, "text", Columns::Severity as i32);
         column.set_sort_column_id(Columns::Severity as i32);
         treeview.append_column(&column);
     }
@@ -266,9 +266,9 @@ fn add_columns(model: &Rc<gtk::ListStore>, treeview: &gtk::TreeView) {
     {
         let renderer = gtk::CellRendererText::new();
         let column = gtk::TreeViewColumn::new();
-        column.pack_start(&renderer, true);
+        TreeViewColumnExt::pack_start(&column, &renderer, true);
         column.set_title("Description");
-        column.add_attribute(&renderer, "text", Columns::Description as i32);
+        TreeViewColumnExt::add_attribute(&column, &renderer, "text", Columns::Description as i32);
         column.set_sort_column_id(Columns::Description as i32);
         treeview.append_column(&column);
     }
@@ -277,21 +277,26 @@ fn add_columns(model: &Rc<gtk::ListStore>, treeview: &gtk::TreeView) {
     {
         let renderer = gtk::CellRendererSpinner::new();
         let column = gtk::TreeViewColumn::new();
-        column.pack_start(&renderer, true);
+        TreeViewColumnExt::pack_start(&column, &renderer, true);
         column.set_title("Spinning");
-        column.add_attribute(&renderer, "pulse", Columns::Pulse as i32);
-        column.add_attribute(&renderer, "active", Columns::Active as i32);
+        TreeViewColumnExt::add_attribute(&column, &renderer, "pulse", Columns::Pulse as i32);
+        TreeViewColumnExt::add_attribute(&column, &renderer, "active", Columns::Active as i32);
         treeview.append_column(&column);
     }
 
     // Column for symbolic icon
     {
         let renderer = gtk::CellRendererPixbuf::new();
         let column = gtk::TreeViewColumn::new();
-        column.pack_start(&renderer, true);
+        TreeViewColumnExt::pack_start(&column, &renderer, true);
         column.set_title("Symbolic icon");
-        column.add_attribute(&renderer, "icon-name", Columns::Icon as i32);
-        column.add_attribute(&renderer, "sensitive", Columns::Sensitive as i32);
+        TreeViewColumnExt::add_attribute(&column, &renderer, "icon-name", Columns::Icon as i32);
+        TreeViewColumnExt::add_attribute(
+            &column,
+            &renderer,
+            "sensitive",
+            Columns::Sensitive as i32,
+        );
         column.set_sort_column_id(Columns::Icon as i32);
         treeview.append_column(&column);
     }

examples/transparent_main_window/main.rs

@@ -34,7 +34,7 @@ fn main() {
 }
 
 fn set_visual(window: &ApplicationWindow, _screen: Option<&gdk::Screen>) {
-    if let Some(screen) = window.screen() {
+    if let Some(screen) = GtkWindowExt::screen(window) {
         if let Some(ref visual) = screen.rgba_visual() {
             window.set_visual(Some(visual)); // crucial for transparency
         }

examples/tree_view/main.rs

@@ -10,8 +10,8 @@ fn append_text_column(tree: &TreeView) {
     let column = TreeViewColumn::new();
     let cell = CellRendererText::new();
 
-    column.pack_start(&cell, true);
-    column.add_attribute(&cell, "text", 0);
+    TreeViewColumnExt::pack_start(&column, &cell, true);
+    TreeViewColumnExt::add_attribute(&column, &cell, "text", 0);
     tree.append_column(&column);
 }
 
@@ -48,13 +48,13 @@ fn build_ui(application: &gtk::Application) {
     let col = TreeViewColumn::new();
 
     col.set_title("Picture");
-    col.pack_start(&renderer, false);
+    TreeViewColumnExt::pack_start(&col, &renderer, false);
 
-    col.add_attribute(&renderer, "pixbuf", 0);
+    TreeViewColumnExt::add_attribute(&col, &renderer, "pixbuf", 0);
 
     let renderer2 = CellRendererText::new();
-    col.pack_start(&renderer2, true);
-    col.add_attribute(&renderer2, "text", 1);
+    TreeViewColumnExt::pack_start(&col, &renderer2, true);
+    TreeViewColumnExt::add_attribute(&col, &renderer2, "text", 1);
     let image = Pixbuf::from_resource("/org/gtk-rs/examples/eye.png")
         .map_err(|err| {
             let msg = err.to_string();

examples/tree_view_model_sort/main.rs

@@ -29,8 +29,8 @@ fn build_ui(application: &gtk::Application) {
     column.set_sort_column_id(0);
 
     let renderer = gtk::CellRendererText::new();
-    column.pack_end(&renderer, true);
-    column.add_attribute(&renderer, "text", 0);
+    TreeViewColumnExt::pack_end(&column, &renderer, true);
+    TreeViewColumnExt::add_attribute(&column, &renderer, "text", 0);
 
     treeview.append_column(&column);
 

examples/tree_view_simple/main.rs

@@ -20,9 +20,9 @@ fn append_column(tree: &TreeView, id: i32) {
     let column = TreeViewColumn::new();
     let cell = CellRendererText::new();
 
-    column.pack_start(&cell, true);
+    TreeViewColumnExt::pack_start(&column, &cell, true);
     // Association of the view's column with the model's `id` column.
-    column.add_attribute(&cell, "text", id);
+    TreeViewColumnExt::add_attribute(&column, &cell, "text", id);
     tree.append_column(&column);
 }