From d6a53cf5d3ba9c41f4bd6255012ac2adfc6487b4 Mon Sep 17 00:00:00 2001
From: Aceeri <conmcclusk@gmail.com>
Date: Mon, 9 Nov 2015 02:49:50 -0800
Subject: Corrections to sharing data

---
 src/api/win32/callback.rs | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

(limited to 'src/api/win32/callback.rs')

diff --git a/src/api/win32/callback.rs b/src/api/win32/callback.rs
index a36320b..bc2b6a6 100644
--- a/src/api/win32/callback.rs
+++ b/src/api/win32/callback.rs
@@ -10,6 +10,7 @@ use WindowAttributes;
 use CursorState;
 use Event;
 use super::event;
+use super::WindowState;
 
 use user32;
 use shell32;
@@ -20,13 +21,6 @@ use winapi;
 /// a thread-local variable.
 thread_local!(pub static CONTEXT_STASH: RefCell<Option<ThreadLocalData>> = RefCell::new(None));
 
-/// Contains information about states and the window for the callback.
-#[derive(Clone)]
-pub struct WindowState {
-    pub cursor_state: CursorState,
-    pub attributes: WindowAttributes
-}
-
 pub struct ThreadLocalData {
     pub win: winapi::HWND,
     pub sender: Sender<Event>,
@@ -257,7 +251,7 @@ pub unsafe extern "system" fn callback(window: winapi::HWND, msg: winapi::UINT,
                 let cstash = cstash.as_ref();
                 // there's a very bizarre borrow checker bug
                 // possibly related to rust-lang/rust/#23338
-                let _window_state = if let Some(cstash) = cstash {
+                let _cursor_state = if let Some(cstash) = cstash {
                     if let Ok(window_state) = cstash.window_state.lock() {
                         match window_state.cursor_state {
                             CursorState::Normal => {
-- 
cgit v1.2.3