From 57a1277aa970a3864f845b5e01b540021dad8bd2 Mon Sep 17 00:00:00 2001
From: the_fiddler <the_fiddler@ebc5dd9b-fb1d-0410-b6f8-d24c324e9604>
Date: Sat, 10 Nov 2007 18:26:05 +0000
Subject: [PATCH] Reverted to 0.3.12 way of handling input events.

---
 Source/OpenTK/GameWindow.cs | 29 ++++++++++++++++++++---------
 1 file changed, 20 insertions(+), 9 deletions(-)

diff --git a/Source/OpenTK/GameWindow.cs b/Source/OpenTK/GameWindow.cs
index 2d4f7dc2..3f6ab276 100644
--- a/Source/OpenTK/GameWindow.cs
+++ b/Source/OpenTK/GameWindow.cs
@@ -49,7 +49,7 @@ namespace OpenTK
     /// parameters that
     /// specify the logic update rate, and the render update rate.
     /// </remarks>
-    public class GameWindow : INativeGLWindow
+    public class GameWindow : IDisposable/* : IGameWindow*/
     {
         #region --- Fields ---
 
@@ -69,7 +69,7 @@ namespace OpenTK
         int width, height;
         VSyncMode vsync;
 
-        InputDriver input_driver;
+        //InputDriver input_driver;
 
         #endregion
 
@@ -119,7 +119,8 @@ namespace OpenTK
                     break;
 
                 default:
-                    throw new PlatformNotSupportedException("Your platform is not supported currently. Please, refer to http://opentk.sourceforge.net for more information.");
+                    throw new PlatformNotSupportedException(
+                        "Your platform is not supported currently. Please, refer to http://opentk.sourceforge.net for more information.");
             }
 
             glWindow.Destroy += new DestroyEvent(glWindow_Destroy);
@@ -408,7 +409,7 @@ namespace OpenTK
                 {
                     glWindow.CreateWindow(mode);
                     this.Title = title;
-                    input_driver = new InputDriver(this);
+                    //input_driver = new InputDriver(this);
                 }
                 catch (ApplicationException expt)
                 {
@@ -812,8 +813,13 @@ namespace OpenTK
         {
             get
             {
-                if (input_driver.Keyboard.Count > 0)
-                    return input_driver.Keyboard[0];
+                //if (input_driver.Keyboard.Count > 0)
+                //    return input_driver.Keyboard[0];
+                //else
+                //    return null;
+                
+                if (glWindow.InputDriver.Keyboard.Count > 0)
+                    return glWindow.InputDriver.Keyboard[0];
                 else
                     return null;
             }
@@ -830,8 +836,13 @@ namespace OpenTK
         {
             get
             {
-                if (input_driver.Mouse.Count > 0)
-                    return input_driver.Mouse[0];
+                //if (input_driver.Mouse.Count > 0)
+                //    return input_driver.Mouse[0];
+                //else
+                //    return null;
+
+                if (glWindow.InputDriver.Mouse.Count > 0)
+                    return glWindow.InputDriver.Mouse[0];
                 else
                     return null;
             }
@@ -1362,7 +1373,7 @@ namespace OpenTK
 
     #region --- GameWindow Exceptions ---
 
-    public class GameWindowExitException : ApplicationException
+    class GameWindowExitException : ApplicationException
     {
     }