Skip to content

Commit

Permalink
Upgrade to gtk 0.18
Browse files Browse the repository at this point in the history
  • Loading branch information
dklassic committed Oct 19, 2023
1 parent 7cc9935 commit 115d5fd
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 9 deletions.
10 changes: 5 additions & 5 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -40,9 +40,9 @@ features = [
]

[target."cfg(target_os = \"linux\")".dependencies]
gtk = "0.16"
gdk = "0.16"
gdk-pixbuf = "0.16"
gtk = "0.18"
gdk = "0.18"
gdk-pixbuf = "0.18"
libxdo = { version = "0.6.0", optional = true }

[target."cfg(target_os = \"macos\")".dependencies]
Expand All @@ -52,6 +52,6 @@ png = "0.17"

[dev-dependencies]
winit = "0.28"
tao = "0.22"
wry = "0.33"
tao = "0.23"
wry = { git = "https://github.com/dklassic/wry.git", branch = "gtk018" }
image = "0.24"
6 changes: 2 additions & 4 deletions src/platform_impl/gtk/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ use crate::{
IsMenuItem, MenuEvent, MenuId, MenuItemKind, MenuItemType, Position,
};
use accelerator::{from_gtk_mnemonic, parse_accelerator, to_gtk_mnemonic};
use gtk::{prelude::*, Container, Orientation};
use gtk::{prelude::*, AboutDialog, Container, Orientation};
use std::{
cell::RefCell,
collections::HashMap,
Expand Down Expand Up @@ -1138,9 +1138,7 @@ impl MenuChild {
register_accel(&item);
item.connect_activate(move |_| {
if let Some(metadata) = &metadata {
let mut builder = gtk::builders::AboutDialogBuilder::new()
.modal(true)
.resizable(false);
let mut builder = AboutDialog::builder().modal(true).resizable(false);

if let Some(name) = &metadata.name {
builder = builder.program_name(name);
Expand Down

0 comments on commit 115d5fd

Please sign in to comment.