Stop using deprecated APIs

bilelmoussaoui · bilelmoussaoui · commit 7c5c416a96d0 · 2023-08-12T21:10:36.000+02:00
diff --git a/book/listings/Cargo.toml b/book/listings/Cargo.toml
@@ -5,7 +5,7 @@ edition = "2021"
 
 
 [dependencies]
-gtk = { version = "*", package = "gtk4", features = ["v4_8"] }
+gtk = { version = "*", package = "gtk4", features = ["v4_12"] }
 adw = { version = ">= 0.3.1", package = "libadwaita", features = ["v1_2"] }
 once_cell = "1.0"
 serde = { version = "1.0", features = ["derive"] }
diff --git a/book/listings/css/1/main.rs b/book/listings/css/1/main.rs
@@ -20,7 +20,7 @@ fn main() -> glib::ExitCode {
 fn load_css() {
     // Load the CSS file and add it to the provider
     let provider = CssProvider::new();
-    provider.load_from_data(include_str!("style.css"));
+    provider.load_from_string(include_str!("style.css"));
 
     // Add the provider to the default screen
     gtk::style_context_add_provider_for_display(
diff --git a/book/listings/css/2/main.rs b/book/listings/css/2/main.rs
@@ -19,7 +19,7 @@ fn main() -> glib::ExitCode {
 fn load_css() {
     // Load the CSS file and add it to the provider
     let provider = CssProvider::new();
-    provider.load_from_data(include_str!("style.css"));
+    provider.load_from_string(include_str!("style.css"));
 
     // Add the provider to the default screen
     gtk::style_context_add_provider_for_display(
diff --git a/book/listings/css/3/main.rs b/book/listings/css/3/main.rs
@@ -19,7 +19,7 @@ fn main() -> glib::ExitCode {
 fn load_css() {
     // Load the CSS file and add it to the provider
     let provider = CssProvider::new();
-    provider.load_from_data(include_str!("style.css"));
+    provider.load_from_string(include_str!("style.css"));
 
     // Add the provider to the default screen
     gtk::style_context_add_provider_for_display(
diff --git a/book/listings/css/4/main.rs b/book/listings/css/4/main.rs
@@ -19,7 +19,7 @@ fn main() -> glib::ExitCode {
 fn load_css() {
     // Load the CSS file and add it to the provider
     let provider = CssProvider::new();
-    provider.load_from_data(include_str!("style.css"));
+    provider.load_from_string(include_str!("style.css"));
 
     // Add the provider to the default screen
     gtk::style_context_add_provider_for_display(
diff --git a/book/listings/css/7/main.rs b/book/listings/css/7/main.rs
@@ -23,7 +23,7 @@ fn main() -> glib::ExitCode {
 fn load_css() {
     // Load the CSS file and add it to the provider
     let provider = CssProvider::new();
-    provider.load_from_data(include_str!("style.css"));
+    provider.load_from_string(include_str!("style.css"));
 
     // Add the provider to the default screen
     gtk::style_context_add_provider_for_display(
diff --git a/book/listings/css/8/main.rs b/book/listings/css/8/main.rs
@@ -23,7 +23,7 @@ fn main() -> glib::ExitCode {
 fn load_css() {
     // Load the CSS file and add it to the provider
     let provider = CssProvider::new();
-    provider.load_from_data(include_str!("style.css"));
+    provider.load_from_string(include_str!("style.css"));
 
     // Add the provider to the default screen
     gtk::style_context_add_provider_for_display(
diff --git a/book/listings/css/9/main.rs b/book/listings/css/9/main.rs
@@ -23,7 +23,7 @@ fn main() -> glib::ExitCode {
 fn load_css() {
     // Load the CSS file and add it to the provider
     let provider = CssProvider::new();
-    provider.load_from_data(include_str!("style.css"));
+    provider.load_from_string(include_str!("style.css"));
 
     // Add the provider to the default screen
     gtk::style_context_add_provider_for_display(
diff --git a/book/listings/todo/4/main.rs b/book/listings/todo/4/main.rs
@@ -33,5 +33,5 @@ fn setup_shortcuts(app: &Application) {
 fn build_ui(app: &Application) {
     // Create a new custom window and show it
     let window = Window::new(app);
-    window.show();
+    window.present();
 }
diff --git a/book/listings/todo/5/main.rs b/book/listings/todo/5/main.rs
@@ -37,6 +37,6 @@ fn setup_shortcuts(app: &adw::Application) {
 fn build_ui(app: &adw::Application) {
     // Create a new custom window and show it
     let window = Window::new(app);
-    window.show();
+    window.present();
 }
 // ANCHOR_END: main
diff --git a/book/listings/todo/6/main.rs b/book/listings/todo/6/main.rs
@@ -32,5 +32,5 @@ fn setup_shortcuts(app: &adw::Application) {
 fn build_ui(app: &adw::Application) {
     // Create a new custom window and show it
     let window = Window::new(app);
-    window.show();
+    window.present();
 }
diff --git a/book/listings/todo/7/main.rs b/book/listings/todo/7/main.rs
@@ -32,5 +32,5 @@ fn setup_shortcuts(app: &adw::Application) {
 fn build_ui(app: &adw::Application) {
     // Create a new custom window and show it
     let window = Window::new(app);
-    window.show();
+    window.present();
 }
diff --git a/book/listings/todo/8/main.rs b/book/listings/todo/8/main.rs
@@ -33,5 +33,5 @@ fn setup_shortcuts(app: &adw::Application) {
 fn build_ui(app: &adw::Application) {
     // Create a new custom window and show it
     let window = Window::new(app);
-    window.show();
+    window.present();
 }
diff --git a/examples/css/main.rs b/examples/css/main.rs
@@ -12,7 +12,7 @@ fn main() -> glib::ExitCode {
     application.connect_startup(|app| {
         // The CSS "magic" happens here.
         let provider = CssProvider::new();
-        provider.load_from_data(include_str!("style.css"));
+        provider.load_from_string(include_str!("style.css"));
         // We give the CssProvided to the default screen so the CSS rules we added
         // can be applied to our window.
         gtk::style_context_add_provider_for_display(
diff --git a/examples/custom_editable/main.rs b/examples/custom_editable/main.rs
@@ -15,7 +15,7 @@ fn main() -> glib::ExitCode {
 
     application.connect_startup(|_| {
         let provider = gtk::CssProvider::new();
-        provider.load_from_data(include_str!("style.css"));
+        provider.load_from_string(include_str!("style.css"));
         gtk::style_context_add_provider_for_display(
             &gdk::Display::default().unwrap(),
             &provider,
diff --git a/gtk4/README.md b/gtk4/README.md
@@ -53,7 +53,7 @@ fn main() -> glib::ExitCode {
             .build();
 
         // Show the window.
-        window.show();
+        window.present();
     });
 
     app.run()
@@ -89,7 +89,7 @@ fn main() -> glib::ExitCode {
         });
         window.set_child(Some(&button));
 
-        window.show();
+        window.present();
     });
 
     application.run()

Original file line number	Diff line number	Diff line change
`@@ -33,5 +33,5 @@ fn setup_shortcuts(app: &Application) {`
`33`	`33`	`fn build_ui(app: &Application) {`
`34`	`34`	`// Create a new custom window and show it`
`35`	`35`	`let window = Window::new(app);`
`36`		`- window.show();`
	`36`	`+ window.present();`
`37`	`37`	`}`
Original file line number	Diff line number	Diff line change
`@@ -37,6 +37,6 @@ fn setup_shortcuts(app: &adw::Application) {`
`37`	`37`	`fn build_ui(app: &adw::Application) {`
`38`	`38`	`// Create a new custom window and show it`
`39`	`39`	`let window = Window::new(app);`
`40`		`- window.show();`
	`40`	`+ window.present();`
`41`	`41`	`}`
`42`	`42`	`// ANCHOR_END: main`