Skip to content
This repository was archived by the owner on Jun 8, 2021. It is now read-only.

Commit 8ef85e0

Browse files
committed
Fix converting generated enums to i32
1 parent acd0598 commit 8ef85e0

File tree

4 files changed

+10
-10
lines changed

4 files changed

+10
-10
lines changed

src/gtktest.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -175,8 +175,8 @@ fn main() {
175175
button_recent.connect_clicked(clone!(window => move |_| {
176176
let dialog = gtk::RecentChooserDialog::new(Some("Recent chooser test"), Some(&window));
177177
dialog.add_buttons(&[
178-
("Ok", gtk::ResponseType::Ok as i32),
179-
("Cancel", gtk::ResponseType::Cancel as i32)
178+
("Ok", gtk::ResponseType::Ok.into()),
179+
("Cancel", gtk::ResponseType::Cancel.into())
180180
]);
181181

182182
dialog.run();
@@ -188,8 +188,8 @@ fn main() {
188188
let dialog = gtk::FileChooserDialog::new(Some("Choose a file"), Some(&window),
189189
gtk::FileChooserAction::Open);
190190
dialog.add_buttons(&[
191-
("Open", gtk::ResponseType::Ok as i32),
192-
("Cancel", gtk::ResponseType::Cancel as i32)
191+
("Open", gtk::ResponseType::Ok.into()),
192+
("Cancel", gtk::ResponseType::Cancel.into())
193193
]);
194194

195195
dialog.set_select_multiple(true);

src/menu_bar.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ fn main() {
7272
let p = Dialog::new_with_buttons(Some("About"),
7373
Some(&window),
7474
gtk::DIALOG_MODAL,
75-
&[("Ok", gtk::ResponseType::Ok as i32)]);
75+
&[("Ok", gtk::ResponseType::Ok.into())]);
7676
let area = p.get_content_area();
7777
let label = Label::new(Some("MenuBar example"));
7878
area.add(&label);

src/notebook.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ impl Notebook {
1818

1919
fn create_tab(&mut self, title: &str, widget: Widget) -> u32 {
2020
let close_image = gtk::Image::new_from_icon_name("window-close",
21-
IconSize::Button as i32);
21+
IconSize::Button.into());
2222
let button = gtk::Button::new();
2323
let label = gtk::Label::new(Some(title));
2424
let tab = gtk::Box::new(Orientation::Horizontal, 0);

src/text_viewer.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ fn main() {
2424
let toolbar = gtk::Toolbar::new();
2525

2626
let open_icon = gtk::Image::new_from_icon_name("document-open",
27-
gtk::IconSize::SmallToolbar as i32);
27+
gtk::IconSize::SmallToolbar.into());
2828
let text_view = gtk::TextView::new();
2929

3030
let open_button = gtk::ToolButton::new::<gtk::Image>(Some(&open_icon), Some("Open"));
@@ -48,10 +48,10 @@ fn main() {
4848
let file_chooser = gtk::FileChooserDialog::new(
4949
Some("Open File"), Some(&window1), gtk::FileChooserAction::Open);
5050
file_chooser.add_buttons(&[
51-
("Open", gtk::ResponseType::Ok as i32),
52-
("Cancel", gtk::ResponseType::Cancel as i32),
51+
("Open", gtk::ResponseType::Ok.into()),
52+
("Cancel", gtk::ResponseType::Cancel.into()),
5353
]);
54-
if file_chooser.run() == gtk::ResponseType::Ok as i32 {
54+
if file_chooser.run() == gtk::ResponseType::Ok.into() {
5555
let filename = file_chooser.get_filename().unwrap();
5656
let file = File::open(&filename).unwrap();
5757

0 commit comments

Comments
 (0)