From 43e617472d7e0c639b44578272ae7c70baa5f1d9 Mon Sep 17 00:00:00 2001 From: Evgenii Pashkin Date: Tue, 28 Jun 2016 07:14:53 +0300 Subject: [PATCH 1/3] Update appveyor.yml --- appveyor.yml | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index a33e803..ab8b861 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -1,14 +1,17 @@ environment: matrix: - - RUST: 1.6.0 + - RUST: stable BITS: 32 - - RUST: 1.6.0 + - RUST: stable BITS: 64 install: - IF "%BITS%" == "32" SET ARCH=i686 - IF "%BITS%" == "64" SET ARCH=x86_64 - - SET RUST_URL=https://static.rust-lang.org/dist/rust-%RUST%-%ARCH%-pc-windows-gnu.exe + - ps: Start-FileDownload "https://static.rust-lang.org/dist/channel-rust-stable" + - ps: $env:RUST_VERSION = Get-Content channel-rust-stable | select -first 1 | %{$_.split('-')[1]} + - if NOT "%RUST%" == "stable" set RUST_VERSION=%RUST% + - SET RUST_URL=https://static.rust-lang.org/dist/rust-%RUST_VERSION%-%ARCH%-pc-windows-gnu.exe - SET PATH=C:\Rust\bin;C:\msys64\mingw%BITS%\bin;%PATH%;C:\msys64\usr\bin - ps: Start-FileDownload $Env:RUST_URL -FileName rust-dist.exe - rust-dist.exe /VERYSILENT /NORESTART /COMPONENTS="Rustc,Gcc,Cargo,Std" /DIR="C:\Rust" From 864894110e5b2bc397306c7daaf72ecafc049518 Mon Sep 17 00:00:00 2001 From: Evgenii Pashkin Date: Sat, 26 Nov 2016 09:52:48 +0300 Subject: [PATCH 2/3] Update features --- Cargo.toml | 5 +++-- appveyor.yml | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index c53097b..68af17a 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -19,10 +19,11 @@ git = "https://github.com/gtk-rs/gdk" git = "https://github.com/gtk-rs/gtk" [features] -#default = ["gtk_3_18"] +#default = ["gtk_3_20"] gtk_3_10 = ["gtk/v3_10"] gtk_3_16 = ["gtk_3_10", "gtk/v3_16"] -gtk_3_18 = ["gtk_3_16"] #for CI tools +gtk_3_18 = ["gtk_3_16", "gtk/v3_18"] #for CI tools +gtk_3_20 = ["gtk_3_18", "gtk/v3_20"] #for CI tools [[bin]] name = "basic" diff --git a/appveyor.yml b/appveyor.yml index ab8b861..3474aff 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -21,6 +21,6 @@ install: build_script: - cargo build - - cargo build --features gtk_3_18 + - cargo build --features gtk_3_20 test: false From 6ee4755786cc94f4bd8a0cdff0b783f531bc2071 Mon Sep 17 00:00:00 2001 From: Evgenii Pashkin Date: Sun, 27 Nov 2016 01:27:01 +0300 Subject: [PATCH 3/3] Fix `multiple applicable items in scope` --- src/notebook.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/notebook.rs b/src/notebook.rs index 9aa229c..79820f6 100644 --- a/src/notebook.rs +++ b/src/notebook.rs @@ -24,7 +24,7 @@ impl Notebook { let tab = gtk::Box::new(Orientation::Horizontal, 0); button.set_relief(ReliefStyle::None); - button.set_focus_on_click(false); + ButtonExt::set_focus_on_click(&button, false); button.add(&close_image); tab.pack_start(&label, false, false, 0);