diff --git a/src/gtktest.rs b/src/gtktest.rs index f866a11..4d54c7e 100644 --- a/src/gtktest.rs +++ b/src/gtktest.rs @@ -194,8 +194,8 @@ fn main() { button_recent.connect_clicked(clone!(window => move |_| { let dialog = gtk::RecentChooserDialog::new(Some("Recent chooser test"), Some(&window)); dialog.add_buttons(&[ - ("Ok", gtk::ResponseType::Ok as i32), - ("Cancel", gtk::ResponseType::Cancel as i32) + ("Ok", gtk::ResponseType::Ok.into()), + ("Cancel", gtk::ResponseType::Cancel.into()) ]); dialog.run(); @@ -207,8 +207,8 @@ fn main() { let dialog = gtk::FileChooserDialog::new(Some("Choose a file"), Some(&window), gtk::FileChooserAction::Open); dialog.add_buttons(&[ - ("Open", gtk::ResponseType::Ok as i32), - ("Cancel", gtk::ResponseType::Cancel as i32) + ("Open", gtk::ResponseType::Ok.into()), + ("Cancel", gtk::ResponseType::Cancel.into()) ]); dialog.set_select_multiple(true); diff --git a/src/notebook.rs b/src/notebook.rs index 81c33ff..9aa229c 100644 --- a/src/notebook.rs +++ b/src/notebook.rs @@ -18,7 +18,7 @@ impl Notebook { fn create_tab(&mut self, title: &str, widget: Widget) -> u32 { let close_image = gtk::Image::new_from_icon_name("window-close", - IconSize::Button as i32); + IconSize::Button.into()); let button = gtk::Button::new(); let label = gtk::Label::new(Some(title)); let tab = gtk::Box::new(Orientation::Horizontal, 0); diff --git a/src/text_viewer.rs b/src/text_viewer.rs index 2e13dea..e5858d8 100644 --- a/src/text_viewer.rs +++ b/src/text_viewer.rs @@ -24,7 +24,7 @@ fn main() { let toolbar = gtk::Toolbar::new(); let open_icon = gtk::Image::new_from_icon_name("document-open", - gtk::IconSize::SmallToolbar as i32); + gtk::IconSize::SmallToolbar.into()); let text_view = gtk::TextView::new(); let open_button = gtk::ToolButton::new::(Some(&open_icon), Some("Open")); @@ -48,10 +48,10 @@ fn main() { let file_chooser = gtk::FileChooserDialog::new( Some("Open File"), Some(&window1), gtk::FileChooserAction::Open); file_chooser.add_buttons(&[ - ("Open", gtk::ResponseType::Ok as i32), - ("Cancel", gtk::ResponseType::Cancel as i32), + ("Open", gtk::ResponseType::Ok.into()), + ("Cancel", gtk::ResponseType::Cancel.into()), ]); - if file_chooser.run() == gtk::ResponseType::Ok as i32 { + if file_chooser.run() == gtk::ResponseType::Ok.into() { let filename = file_chooser.get_filename().unwrap(); let file = File::open(&filename).unwrap();