Merge pull request imgui-rs#225 from thomcc/update-glium-0.25

Update glium to 0.25.0
vojd · Jun 26, 2019 · 3721aca · 3721aca
2 parents 92ebcce + f878f54
commit 3721aca
Show file tree

Hide file tree

Showing 5 changed files with 45 additions and 17 deletions.
diff --git a/imgui-glium-examples/Cargo.lock b/imgui-glium-examples/Cargo.lock
diff --git a/imgui-glium-examples/Cargo.toml b/imgui-glium-examples/Cargo.toml
@@ -10,7 +10,7 @@ license = "MIT/Apache-2.0"
 publish = false
 
 [dev-dependencies]
-glium = { version = "0.24", default-features = true }
+glium = { version = "0.25", default-features = true }
 imgui = { version = "0.0.24-pre", path = "../" }
 imgui-glium-renderer = { version = "0.0.24-pre", path = "../imgui-glium-renderer" }
 imgui-winit-support = { version = "0.0.24-pre", path = "../imgui-winit-support" }

diff --git a/imgui-glium-examples/examples/support/mod.rs b/imgui-glium-examples/examples/support/mod.rs
@@ -23,7 +23,8 @@ where
         .with_title(title)
         .with_dimensions(glutin::dpi::LogicalSize::new(1024f64, 768f64));
     let display = Display::new(builder, context, &events_loop).unwrap();
-    let window = display.gl_window();
+    let gl_window = display.gl_window();
+    let window = gl_window.window();
 
     let mut imgui = ImGui::init();
     imgui.set_ini_filename(None);

diff --git a/imgui-glium-renderer/Cargo.toml b/imgui-glium-renderer/Cargo.toml
@@ -13,6 +13,6 @@ categories = ["gui", "rendering"]
 travis-ci = { repository = "Gekkio/imgui-rs" }
 
 [dependencies]
-glium = { version = "0.24", default-features = false }
+glium = { version = "0.25", default-features = false }
 imgui = { version = "0.0.24-pre", path = "../" }
 imgui-sys = { version = "0.0.24-pre", path = "../imgui-sys", features = ["glium"] }
diff --git a/imgui-sys/Cargo.toml b/imgui-sys/Cargo.toml
@@ -16,7 +16,7 @@ travis-ci = { repository = "Gekkio/imgui-rs" }
 [dependencies]
 libc = "0.2"
 bitflags = "1.0"
-glium = { version = "0.24", default-features = false, optional = true }
+glium = { version = "0.25", default-features = false, optional = true }
 gfx = { version = "0.18", optional = true }
 
 [build-dependencies]