diff options
author | tomaka <pierre.krieger1708@gmail.com> | 2014-12-14 08:04:44 +0100 |
---|---|---|
committer | tomaka <pierre.krieger1708@gmail.com> | 2014-12-14 08:04:44 +0100 |
commit | 65dfd5d7cead3b7d52c2e02e31efb2a8a83dc7f7 (patch) | |
tree | 12fb2328d35e30e73164887d492b05af38ffa4fa | |
parent | 230b0dd9ed27863daa8a6afefe7394ae4e6a38b9 (diff) | |
parent | a79bc34807fc0bb991a8693f0d7271b17a7c6513 (diff) | |
download | glutin-65dfd5d7cead3b7d52c2e02e31efb2a8a83dc7f7.tar.gz glutin-65dfd5d7cead3b7d52c2e02e31efb2a8a83dc7f7.zip |
Merge pull request #159 from tomaka/update-rustc
Update for Rustc for win32
-rw-r--r-- | src/events.rs | 8 | ||||
-rw-r--r-- | src/lib.rs | 1 |
2 files changed, 5 insertions, 4 deletions
diff --git a/src/events.rs b/src/events.rs index fde55f5..76fda81 100644 --- a/src/events.rs +++ b/src/events.rs @@ -1,4 +1,4 @@ -#[deriving(Clone,Show)] +#[deriving(Clone, Show, Copy)] pub enum Event { /// The size of the window has changed. Resized(uint, uint), @@ -35,13 +35,13 @@ pub enum Event { pub type ScanCode = u8; -#[deriving(Show, Hash, PartialEq, Eq, Clone)] +#[deriving(Show, Hash, PartialEq, Eq, Clone, Copy)] pub enum ElementState { Pressed, Released, } -#[deriving(Show, Hash, PartialEq, Eq, Clone)] +#[deriving(Show, Hash, PartialEq, Eq, Clone, Copy)] pub enum MouseButton { LeftMouseButton, RightMouseButton, @@ -49,7 +49,7 @@ pub enum MouseButton { OtherMouseButton(u8), } -#[deriving(Show, Hash, PartialEq, Eq, Clone)] +#[deriving(Show, Hash, PartialEq, Eq, Clone, Copy)] pub enum VirtualKeyCode { /// The '1' key over the letters. Key1, @@ -83,6 +83,7 @@ impl std::error::Error for CreationError { } /// All APIs related to OpenGL that you can possibly get while using glutin. +#[deriving(Show, Clone, Copy, PartialEq, Eq)] pub enum Api { /// The classical OpenGL. Available on Windows, Linux, OS/X. OpenGl, |