Merge pending into master

Cargo.toml

@@ -11,10 +11,11 @@ gtk = "^0"
 cairo-rs = "^0"
 
 [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"

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"
@@ -18,6 +21,6 @@ install:
 
 build_script:
   - cargo build
-  - cargo build --features gtk_3_18
+  - cargo build --features gtk_3_20
 
 test: false

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);