diff --git a/Build/Build.exe b/Build/Build.exe
index d2ec398a..b4ba2af0 100644
Binary files a/Build/Build.exe and b/Build/Build.exe differ
diff --git a/Build/Instructions.txt b/Build/Instructions.txt
index ab2551cb..866c75be 100644
--- a/Build/Instructions.txt
+++ b/Build/Instructions.txt
@@ -4,7 +4,7 @@ How to build OpenTK:
 2) Navigate to the Build folder and execute Build.exe:
 	2a) Under Linux/Mac OS X, type 'mono Build.exe mono' or 'mono Build.exe mono debug' for the release/debug versions of the library.
 	2b) Under Windows type 'build net' (or 'build net debug').
-3) The binaries (library, examples) are placed in the Binaries/Release folder.
+3) The binaries (library, examples) are placed in the Binaries/Release or Binaries/Debug folder.
 
 
 There are other parameters you can pass to Build.exe. A brief list:
@@ -15,7 +15,6 @@ debug - build the debug version (e.g. 'build net debug').
 
 clean - delete intermediate object files and projects (reclaim some space, the binaries are not touched).
 distclean - delete intermediate and final object files (reclaim all space used during compilation).
-svnclean - delete '.svn' folders. Useful if you checked out from svn, useless if you downloaded a file release.
 
 vs2005 - create project files for Visual Studio 2005.
 monodev - create project files for MonoDevelop.
diff --git a/Source/Bind/BindStreamWriter.cs b/Source/Bind/BindStreamWriter.cs
index 32550cb6..0ad17268 100644
--- a/Source/Bind/BindStreamWriter.cs
+++ b/Source/Bind/BindStreamWriter.cs
@@ -1,4 +1,10 @@
-using System;
+#region --- License ---
+/* Copyright (c) 2006, 2007 Stefanos Apostolopoulos
+ * See license.txt for license info
+ */
+#endregion
+
+using System;
 using System.Collections.Generic;
 using System.Text;
 using System.IO;
diff --git a/Source/Bind/GL2/Generator.cs b/Source/Bind/GL2/Generator.cs
index cdde552a..bb972ef6 100644
--- a/Source/Bind/GL2/Generator.cs
+++ b/Source/Bind/GL2/Generator.cs
@@ -1,4 +1,10 @@
-using System;
+#region --- License ---
+/* Copyright (c) 2006, 2007 Stefanos Apostolopoulos
+ * See license.txt for license info
+ */
+#endregion
+
+using System;
 using System.Collections.Generic;
 using System.Text;
 using System.IO;
diff --git a/Source/Bind/GL2/SpecReader.cs b/Source/Bind/GL2/SpecReader.cs
index b25ffeca..a3ffe881 100644
--- a/Source/Bind/GL2/SpecReader.cs
+++ b/Source/Bind/GL2/SpecReader.cs
@@ -1,4 +1,10 @@
-using System;
+#region --- License ---
+/* Copyright (c) 2006, 2007 Stefanos Apostolopoulos
+ * See license.txt for license info
+ */
+#endregion
+
+using System;
 using System.Collections.Generic;
 using System.Text;
 using Bind.Structures;
diff --git a/Source/Bind/GL2/SpecWriter.cs b/Source/Bind/GL2/SpecWriter.cs
index b6e89176..acb86384 100644
--- a/Source/Bind/GL2/SpecWriter.cs
+++ b/Source/Bind/GL2/SpecWriter.cs
@@ -1,4 +1,10 @@
-using System;
+#region --- License ---
+/* Copyright (c) 2006, 2007 Stefanos Apostolopoulos
+ * See license.txt for license info
+ */
+#endregion
+
+using System;
 using System.Collections.Generic;
 using System.Text;
 using Bind.Structures;
diff --git a/Source/Bind/IBind.cs b/Source/Bind/IBind.cs
index 2dc1a32b..81d8136a 100644
--- a/Source/Bind/IBind.cs
+++ b/Source/Bind/IBind.cs
@@ -1,4 +1,10 @@
-using System;
+#region --- License ---
+/* Copyright (c) 2006, 2007 Stefanos Apostolopoulos
+ * See license.txt for license info
+ */
+#endregion
+
+using System;
 using System.Collections.Generic;
 using System.Text;
 
diff --git a/Source/Bind/ISpecReader.cs b/Source/Bind/ISpecReader.cs
index 84f0bf9c..8f6e5037 100644
--- a/Source/Bind/ISpecReader.cs
+++ b/Source/Bind/ISpecReader.cs
@@ -1,4 +1,10 @@
-using System;
+#region --- License ---
+/* Copyright (c) 2006, 2007 Stefanos Apostolopoulos
+ * See license.txt for license info
+ */
+#endregion
+
+using System;
 using System.Collections.Generic;
 using System.Text;
 using System.IO;
diff --git a/Source/Bind/ISpecWriter.cs b/Source/Bind/ISpecWriter.cs
index 5198e819..063fd97f 100644
--- a/Source/Bind/ISpecWriter.cs
+++ b/Source/Bind/ISpecWriter.cs
@@ -1,4 +1,10 @@
-using System;
+#region --- License ---
+/* Copyright (c) 2006, 2007 Stefanos Apostolopoulos
+ * See license.txt for license info
+ */
+#endregion
+
+using System;
 using System.Collections.Generic;
 using System.Text;
 using System.IO;
diff --git a/Source/Bind/Main.cs b/Source/Bind/Main.cs
index 13e3cfbf..bdcee54a 100644
--- a/Source/Bind/Main.cs
+++ b/Source/Bind/Main.cs
@@ -1,29 +1,8 @@
-#region License
-/*
-MIT License
-Copyright ©2003-2006 Tao Framework Team
-http://www.taoframework.com
-All rights reserved.
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
-*/
-#endregion License
+#region --- License ---
+/* Copyright (c) 2006, 2007 Stefanos Apostolopoulos
+ * See license.txt for license info
+ */
+#endregion
 
 using System;
 using System.Text;
diff --git a/Source/Bind/Settings.cs b/Source/Bind/Settings.cs
index 03410ea1..a76a691e 100644
--- a/Source/Bind/Settings.cs
+++ b/Source/Bind/Settings.cs
@@ -1,6 +1,7 @@
-#region License
-//Copyright (c) 2006 Stefanos Apostolopoulos
-//See license.txt for license info
+#region --- License ---
+/* Copyright (c) 2006, 2007 Stefanos Apostolopoulos
+ * See license.txt for license info
+ */
 #endregion
 
 using System;
diff --git a/Source/Bind/Structures/Constant.cs b/Source/Bind/Structures/Constant.cs
index 2c21c6fc..3616537e 100644
--- a/Source/Bind/Structures/Constant.cs
+++ b/Source/Bind/Structures/Constant.cs
@@ -1,6 +1,7 @@
-#region License
-//Copyright (c) 2006 Stefanos Apostolopoulos
-//See license.txt for license info
+#region --- License ---
+/* Copyright (c) 2006, 2007 Stefanos Apostolopoulos
+ * See license.txt for license info
+ */
 #endregion
 
 using System;
diff --git a/Source/Bind/Structures/Delegate.cs b/Source/Bind/Structures/Delegate.cs
index f01db5ad..44be586e 100644
--- a/Source/Bind/Structures/Delegate.cs
+++ b/Source/Bind/Structures/Delegate.cs
@@ -108,8 +108,6 @@ namespace Bind.Structures
 
         #region public bool NeedsWrapper
 
-        bool _needs_wrapper;
-
         /// <summary>
         /// Indicates whether this function needs to be wrapped with a Marshaling function.
         /// This flag is set if a function contains an Array parameter, or returns
diff --git a/Source/Bind/Structures/Enum.cs b/Source/Bind/Structures/Enum.cs
index cf6690cb..f7db633f 100644
--- a/Source/Bind/Structures/Enum.cs
+++ b/Source/Bind/Structures/Enum.cs
@@ -1,6 +1,7 @@
-#region License
-//Copyright (c) 2006 Stefanos Apostolopoulos
-//See license.txt for license info
+#region --- License ---
+/* Copyright (c) 2006, 2007 Stefanos Apostolopoulos
+ * See license.txt for license info
+ */
 #endregion
 
 using System;
diff --git a/Source/Bind/Structures/Parameter.cs b/Source/Bind/Structures/Parameter.cs
index 9870cf8b..288b3ea1 100644
--- a/Source/Bind/Structures/Parameter.cs
+++ b/Source/Bind/Structures/Parameter.cs
@@ -1,6 +1,7 @@
-#region License
-//Copyright (c) 2006 Stefanos Apostolopoulos
-//See license.txt for license info
+#region --- License ---
+/* Copyright (c) 2006, 2007 Stefanos Apostolopoulos
+ * See license.txt for license info
+ */
 #endregion
 
 using System;
@@ -123,30 +124,6 @@ namespace Bind.Structures
 
         #endregion
 
-        #region public string GetFullType()
-
-        public string GetFullType(Dictionary<string, string> CSTypes, bool compliant)
-        {
-            if (Pointer && Settings.Compatibility == Settings.Legacy.Tao)
-                return "IntPtr";
-
-            if (!compliant)
-            {
-                return
-                    CurrentType +
-                    (Pointer ? "*" : "") +
-                    (Array > 0 ? "[]" : "");
-            }
-
-            return 
-                GetCLSCompliantType() +
-                (Pointer ? "*" : "") +
-                (Array > 0 ? "[]" : "");
-
-        }
-
-        #endregion
-
         #region override public string ToString()
 
         override public string ToString()
@@ -216,6 +193,8 @@ namespace Bind.Structures
 
         #endregion
 
+        #region internal static Parameter Translate(Parameter par, string Category)
+        
         internal static Parameter Translate(Parameter par, string Category)
         {
             Enum @enum;
@@ -296,6 +275,8 @@ namespace Bind.Structures
 
             return p;
         }
+        
+        #endregion
     }
 
     #endregion
diff --git a/Source/Bind/Structures/Type.cs b/Source/Bind/Structures/Type.cs
index 53ac0424..95cdb336 100644
--- a/Source/Bind/Structures/Type.cs
+++ b/Source/Bind/Structures/Type.cs
@@ -1,4 +1,10 @@
-using System;
+#region --- License ---
+/* Copyright (c) 2006, 2007 Stefanos Apostolopoulos
+ * See license.txt for license info
+ */
+#endregion
+
+using System;
 using System.Collections.Generic;
 using System.Text;
 using System.IO;
@@ -12,6 +18,8 @@ namespace Bind.Structures
 
         private static bool typesLoaded;
 
+        #region internal static void Initialize(string glTypes, string csTypes)
+        
         internal static void Initialize(string glTypes, string csTypes)
         {
             if (!typesLoaded)
@@ -33,7 +41,11 @@ namespace Bind.Structures
                 typesLoaded = true;
             }
         }
+        
+        #endregion
 
+        #region --- Constructors ---
+        
         public Type()
         {
         }
@@ -47,6 +59,8 @@ namespace Bind.Structures
             this.Pointer = t.Pointer;
             this.Reference = t.Reference;
         }
+        
+        #endregion
 
         #region public string Type
 
@@ -217,10 +231,16 @@ namespace Bind.Structures
 
         #endregion
 
+        #region public override string ToString()
+        
         public override string ToString()
         {
             return CurrentType;
         }
+        
+        #endregion
+        
+        #region internal static Type Translate(Type type)
 
         internal static Type Translate(Type type)
         {
@@ -234,5 +254,7 @@ namespace Bind.Structures
 
             return t;
         }
+        
+        #endregion
     }
 }
diff --git a/Source/Bind/Utilities.cs b/Source/Bind/Utilities.cs
index f5ca722a..0c91930d 100644
--- a/Source/Bind/Utilities.cs
+++ b/Source/Bind/Utilities.cs
@@ -1,4 +1,10 @@
-using System;
+#region --- License ---
+/* Copyright (c) 2006, 2007 Stefanos Apostolopoulos
+ * See license.txt for license info
+ */
+#endregion
+
+using System;
 using System.Collections.Generic;
 using System.Text;
 using System.IO;
diff --git a/Source/Bind/Wgl/Generator.cs b/Source/Bind/Wgl/Generator.cs
index b5070ada..9b57d340 100644
--- a/Source/Bind/Wgl/Generator.cs
+++ b/Source/Bind/Wgl/Generator.cs
@@ -1,4 +1,10 @@
-using System;
+#region --- License ---
+/* Copyright (c) 2006, 2007 Stefanos Apostolopoulos
+ * See license.txt for license info
+ */
+#endregion
+
+using System;
 using System.Collections.Generic;
 using System.Text;
 
diff --git a/Source/Build/Build.cs b/Source/Build/Build.cs
index 4fcdf3f4..79210b34 100644
--- a/Source/Build/Build.cs
+++ b/Source/Build/Build.cs
@@ -43,6 +43,7 @@ namespace OpenTK.Build
             Mono,
             VS2005,
             SharpDevelop,
+            SharpDevelop2,
             MonoDevelop,
             Clean,
             DistClean,
@@ -108,6 +109,12 @@ namespace OpenTK.Build
                             target = BuildTarget.MonoDevelop;
                             break;
 
+                        case "sharpdev2":
+                        case "sharpdevelop2":
+                        case "sd2":
+                            target = BuildTarget.SharpDevelop2;
+                            break;
+                           
                         case "sharpdev":
                         case "sharpdevelop":
                         case "sd":
@@ -177,7 +184,12 @@ namespace OpenTK.Build
 
                     case BuildTarget.SharpDevelop:
                         Console.WriteLine("Creating SharpDevelop project files");
-                        ExecuteProcess(PrebuildPath, "/target monodev /file " + PrebuildXml);
+                        ExecuteProcess(PrebuildPath, "/target sharpdev /file " + PrebuildXml);
+                        break;
+                        
+                    case BuildTarget.SharpDevelop2:
+                        Console.WriteLine("Creating SharpDevelop project files");
+                        ExecuteProcess(PrebuildPath, "/target sharpdev2 /file " + PrebuildXml);
                         break;
 
                     case BuildTarget.VS2005:
diff --git a/Source/Examples/ExampleLauncher.cs b/Source/Examples/ExampleLauncher.cs
index 765239cf..aeebc664 100644
--- a/Source/Examples/ExampleLauncher.cs
+++ b/Source/Examples/ExampleLauncher.cs
@@ -1,4 +1,10 @@
-using System;
+#region --- License ---
+/* Copyright (c) 2006, 2007 Stefanos Apostolopoulos
+ * See license.txt for license info
+ */
+#endregion
+
+using System;
 using System.Collections.Generic;
 using System.ComponentModel;
 using System.Data;
@@ -139,4 +145,4 @@ namespace Examples
             }
         }
     }
-}
\ No newline at end of file
+}
diff --git a/Source/Examples/IExample.cs b/Source/Examples/IExample.cs
index c409129a..a1c36e0a 100644
--- a/Source/Examples/IExample.cs
+++ b/Source/Examples/IExample.cs
@@ -1,4 +1,10 @@
-using System;
+#region --- License ---
+/* Copyright (c) 2006, 2007 Stefanos Apostolopoulos
+ * See license.txt for license info
+ */
+#endregion
+
+using System;
 using System.Collections.Generic;
 using System.Text;
 
diff --git a/Source/Examples/OpenGL/Basic/NoFramework/QueryModesForm.cs b/Source/Examples/OpenGL/Basic/NoFramework/QueryModesForm.cs
index e9d1e363..391faeef 100644
--- a/Source/Examples/OpenGL/Basic/NoFramework/QueryModesForm.cs
+++ b/Source/Examples/OpenGL/Basic/NoFramework/QueryModesForm.cs
@@ -1,3 +1,9 @@
+#region --- License ---
+/* Copyright (c) 2006, 2007 Stefanos Apostolopoulos
+ * See license.txt for license info
+ */
+#endregion
+
 #region --- Using Directives ---
 
 using System;
@@ -261,4 +267,4 @@ namespace Examples.Windowing
             */
         }
     }
-}
\ No newline at end of file
+}
diff --git a/Source/Examples/OpenGL/Basic/QueryDisplayModes/DisplayModesForm.cs b/Source/Examples/OpenGL/Basic/QueryDisplayModes/DisplayModesForm.cs
index 863c8f80..97767198 100644
--- a/Source/Examples/OpenGL/Basic/QueryDisplayModes/DisplayModesForm.cs
+++ b/Source/Examples/OpenGL/Basic/QueryDisplayModes/DisplayModesForm.cs
@@ -1,3 +1,9 @@
+#region --- License ---
+/* Copyright (c) 2006, 2007 Stefanos Apostolopoulos
+ * See license.txt for license info
+ */
+#endregion
+
 using System;
 using System.Collections.Generic;
 using System.ComponentModel;
@@ -29,4 +35,4 @@ namespace Examples.Windowing
 
         }
     }
-}
\ No newline at end of file
+}
diff --git a/Source/Examples/OpenGL/Basic/QueryDisplayModes/Program.cs b/Source/Examples/OpenGL/Basic/QueryDisplayModes/Program.cs
index 718313ec..c1d8efb1 100644
--- a/Source/Examples/OpenGL/Basic/QueryDisplayModes/Program.cs
+++ b/Source/Examples/OpenGL/Basic/QueryDisplayModes/Program.cs
@@ -1,3 +1,9 @@
+#region --- License ---
+/* Copyright (c) 2006, 2007 Stefanos Apostolopoulos
+ * See license.txt for license info
+ */
+#endregion
+
 using System;
 using System.Collections.Generic;
 using System.Windows.Forms;
@@ -8,4 +14,4 @@ namespace QueryDisplayModes
     {
 
     }
-}
\ No newline at end of file
+}
diff --git a/Source/Examples/Tests/S01_Call_Performance.cs b/Source/Examples/Tests/S01_Call_Performance.cs
index 9942c287..5573a0a1 100644
--- a/Source/Examples/Tests/S01_Call_Performance.cs
+++ b/Source/Examples/Tests/S01_Call_Performance.cs
@@ -1,4 +1,10 @@
-using System;
+#region --- License ---
+/* Copyright (c) 2006, 2007 Stefanos Apostolopoulos
+ * See license.txt for license info
+ */
+#endregion
+
+using System;
 using System.Collections.Generic;
 using System.ComponentModel;
 using System.Data;
@@ -12,7 +18,7 @@ using System.Runtime.InteropServices;
 
 namespace Examples.Tests
 {
-    public partial class S01_Call_Performance : Form, IExample
+    public  partial class S01_Call_Performance : Form /*, IExample*/
     {
         public S01_Call_Performance()
         {
@@ -113,4 +119,4 @@ namespace Examples.Tests
 
         #endregion
     }
-}
\ No newline at end of file
+}
diff --git a/Source/Examples/Tests/S02_RawInput_Logger.cs b/Source/Examples/Tests/S02_RawInput_Logger.cs
index 1aa4ec11..5a687825 100644
--- a/Source/Examples/Tests/S02_RawInput_Logger.cs
+++ b/Source/Examples/Tests/S02_RawInput_Logger.cs
@@ -1,4 +1,10 @@
-using System;
+#region --- License ---
+/* Copyright (c) 2006, 2007 Stefanos Apostolopoulos
+ * See license.txt for license info
+ */
+#endregion
+
+using System;
 using System.Collections.Generic;
 using System.Text;
 using System.Windows.Forms;
@@ -74,16 +80,5 @@ namespace Examples.Tests
             GL.Clear(GL.Enums.ClearBufferMask.COLOR_BUFFER_BIT);
             Context.SwapBuffers();
         }
-
-        public override void Run()
-        {
-            while (!Quit)
-            {
-                ProcessEvents();
-                OnUpdateFrame(EventArgs.Empty);
-                OnRenderFrame(EventArgs.Empty);
-                Thread.Sleep(10);
-            }
-        }
     }
 }
diff --git a/Source/Examples/Tutorial/T08_VBO.cs b/Source/Examples/Tutorial/T08_VBO.cs
index 1438b307..a755cde8 100644
--- a/Source/Examples/Tutorial/T08_VBO.cs
+++ b/Source/Examples/Tutorial/T08_VBO.cs
@@ -19,7 +19,7 @@ using System.Threading;
 
 namespace Examples.Tutorial
 {
-    public class T08_VBO : OpenTK.GameWindow, IExample
+    public class T08_VBO : OpenTK.GameWindow /*, IExample */
     {
         #region --- Private Fields ---
 
diff --git a/Source/Examples/WinForms/W01_First_Window.Designer.cs b/Source/Examples/WinForms/W01_First_Window.Designer.cs
index abd7da73..9cca2746 100644
--- a/Source/Examples/WinForms/W01_First_Window.Designer.cs
+++ b/Source/Examples/WinForms/W01_First_Window.Designer.cs
@@ -45,7 +45,6 @@
             this.glControl1.Name = "glControl1";
             this.glControl1.Size = new System.Drawing.Size(629, 565);
             this.glControl1.TabIndex = 0;
-            this.glControl1.Resize += new OpenTK.Platform.ResizeEvent(this.glControl1_Resize);
             this.glControl1.Paint += new System.Windows.Forms.PaintEventHandler(this.glControl1_Paint);
             this.glControl1.KeyDown += new System.Windows.Forms.KeyEventHandler(this.glControl1_KeyDown);
             // 
@@ -104,4 +103,4 @@
         private System.Windows.Forms.Button greenButton;
         private System.Windows.Forms.Button blueButton;
     }
-}
\ No newline at end of file
+}
diff --git a/Source/Examples/WinForms/W01_First_Window.cs b/Source/Examples/WinForms/W01_First_Window.cs
index 158ac567..fd3428b5 100644
--- a/Source/Examples/WinForms/W01_First_Window.cs
+++ b/Source/Examples/WinForms/W01_First_Window.cs
@@ -23,7 +23,6 @@ namespace Examples.WinForms
 {
     public partial class W01_First_Window : Form, IExample
     {
-        OpenTK.InputDriver input;
         public W01_First_Window()
         {
             InitializeComponent();
@@ -34,8 +33,6 @@ namespace Examples.WinForms
         protected override void OnHandleCreated(EventArgs e)
         {
             base.OnHandleCreated(e);
-
-            //input = new OpenTK.InputDriver(OpenTK.Platform.Utilities.GetWindowInfo(this));
         }
 
         private void redButton_Click(object sender, EventArgs e)
@@ -89,4 +86,4 @@ namespace Examples.WinForms
 
         #endregion
     }
-}
+}
diff --git a/Source/OpenTK/GLControl.cs b/Source/OpenTK/GLControl.cs
index c9f0cbdd..95ed6c5d 100644
--- a/Source/OpenTK/GLControl.cs
+++ b/Source/OpenTK/GLControl.cs
@@ -64,7 +64,7 @@ namespace OpenTK
                      Environment.OSVersion.Platform == (PlatformID)128)
                     // some older versions of Mono reported 128.
             {
-                glControl =  new OpenTK.Platform.X11.X11GLControl(this, Width, Height, false);
+	glControl =  new OpenTK.Platform.X11.X11GLControl(this, new DisplayMode(Width, Height));
             }
             else
             {
@@ -147,8 +147,6 @@ namespace OpenTK
 
         #region --- IGLControl Members ---
 
-        public event CreateEvent Create;
-
         #region public bool IsIdle
 
         /// <summary>
@@ -246,7 +244,7 @@ namespace OpenTK
 
         #region --- IResizable Members ---
 
-        public new event ResizeEvent Resize;
+        //public new event ResizeEvent Resize;
 
         #endregion
 
diff --git a/Source/OpenTK/Input/IInputDevice.cs b/Source/OpenTK/Input/IInputDevice.cs
index 918d23ac..1dc00986 100644
--- a/Source/OpenTK/Input/IInputDevice.cs
+++ b/Source/OpenTK/Input/IInputDevice.cs
@@ -1,4 +1,10 @@
-using System;
+#region --- License ---
+/* Copyright (c) 2006, 2007 Stefanos Apostolopoulos
+ * See license.txt for license info
+ */
+#endregion
+
+using System;
 using System.Collections.Generic;
 using System.Text;
 
@@ -30,4 +36,4 @@ namespace OpenTK.Input
         /// </summary>
         HID
     }
-}
\ No newline at end of file
+}
diff --git a/Source/OpenTK/Input/IInputDriver.cs b/Source/OpenTK/Input/IInputDriver.cs
index d69dd889..9d1ceca3 100644
--- a/Source/OpenTK/Input/IInputDriver.cs
+++ b/Source/OpenTK/Input/IInputDriver.cs
@@ -1,4 +1,10 @@
-using System;
+#region --- License ---
+/* Copyright (c) 2006, 2007 Stefanos Apostolopoulos
+ * See license.txt for license info
+ */
+#endregion
+
+using System;
 using System.Collections.Generic;
 using System.Text;
 
@@ -11,4 +17,4 @@ namespace OpenTK.Input
         //IEnumerable<IMouse> Mice { get; }
         //IEnumerable<IHid> Hids { get; }
     }
-}
\ No newline at end of file
+}
diff --git a/Source/OpenTK/Input/IKeyboardDriver.cs b/Source/OpenTK/Input/IKeyboardDriver.cs
index 688e18b9..70201957 100644
--- a/Source/OpenTK/Input/IKeyboardDriver.cs
+++ b/Source/OpenTK/Input/IKeyboardDriver.cs
@@ -1,4 +1,10 @@
-using System;
+#region --- License ---
+/* Copyright (c) 2006, 2007 Stefanos Apostolopoulos
+ * See license.txt for license info
+ */
+#endregion
+
+using System;
 using System.Collections.Generic;
 using System.Text;
 
diff --git a/Source/OpenTK/Input/IMouse.cs b/Source/OpenTK/Input/IMouse.cs
index 44368aa7..3e7e43df 100644
--- a/Source/OpenTK/Input/IMouse.cs
+++ b/Source/OpenTK/Input/IMouse.cs
@@ -1,4 +1,10 @@
-using System;
+#region --- License ---
+/* Copyright (c) 2006, 2007 Stefanos Apostolopoulos
+ * See license.txt for license info
+ */
+#endregion
+
+using System;
 using System.Collections.Generic;
 using System.Text;
 
diff --git a/Source/OpenTK/Input/IMouseDriver.cs b/Source/OpenTK/Input/IMouseDriver.cs
index d05a21ad..1f4de18a 100644
--- a/Source/OpenTK/Input/IMouseDriver.cs
+++ b/Source/OpenTK/Input/IMouseDriver.cs
@@ -1,4 +1,10 @@
-using System;
+#region --- License ---
+/* Copyright (c) 2006, 2007 Stefanos Apostolopoulos
+ * See license.txt for license info
+ */
+#endregion
+
+using System;
 using System.Collections.Generic;
 using System.Text;
 
diff --git a/Source/OpenTK/Input/Mouse.cs b/Source/OpenTK/Input/Mouse.cs
index aa6fe1b2..e505fbf8 100644
--- a/Source/OpenTK/Input/Mouse.cs
+++ b/Source/OpenTK/Input/Mouse.cs
@@ -1,4 +1,10 @@
-using System;
+#region --- License ---
+/* Copyright (c) 2006, 2007 Stefanos Apostolopoulos
+ * See license.txt for license info
+ */
+#endregion
+
+using System;
 using System.Collections.Generic;
 using System.Text;
 
diff --git a/Source/OpenTK/InputDriver.cs b/Source/OpenTK/InputDriver.cs
index 296eb62b..dfcdfb25 100644
--- a/Source/OpenTK/InputDriver.cs
+++ b/Source/OpenTK/InputDriver.cs
@@ -1,4 +1,10 @@
-using System;
+#region --- License ---
+/* Copyright (c) 2006, 2007 Stefanos Apostolopoulos
+ * See license.txt for license info
+ */
+#endregion
+
+using System;
 using System.Collections.Generic;
 using System.Text;
 
diff --git a/Source/OpenTK/OpenGL/GLHelper.cs b/Source/OpenTK/OpenGL/GLHelper.cs
index 0c9b31dc..6a271382 100644
--- a/Source/OpenTK/OpenGL/GLHelper.cs
+++ b/Source/OpenTK/OpenGL/GLHelper.cs
@@ -4,7 +4,6 @@
  */
 #endregion
 
-
 #region --- Using Directives ---
 
 using System;
diff --git a/Source/OpenTK/Platform/IGameWindow.cs b/Source/OpenTK/Platform/IGameWindow.cs
index 1400b6a3..0eca79b9 100644
--- a/Source/OpenTK/Platform/IGameWindow.cs
+++ b/Source/OpenTK/Platform/IGameWindow.cs
@@ -1,8 +1,13 @@
-using System;
+#region --- License ---
+/* Copyright (c) 2006, 2007 Stefanos Apostolopoulos
+ * See license.txt for license info
+ */
+#endregion
+
+using System;
 using System.Collections.Generic;
 using System.Text;
 
-
 namespace OpenTK.Platform
 {
     interface IGameWindow : INativeGLWindow
diff --git a/Source/OpenTK/Platform/INativeGLWindow.cs b/Source/OpenTK/Platform/INativeGLWindow.cs
index f2bcdedb..d916f81a 100644
--- a/Source/OpenTK/Platform/INativeGLWindow.cs
+++ b/Source/OpenTK/Platform/INativeGLWindow.cs
@@ -1,4 +1,10 @@
-using System;
+#region --- License ---
+/* Copyright (c) 2006, 2007 Stefanos Apostolopoulos
+ * See license.txt for license info
+ */
+#endregion
+
+using System;
 using System.Collections.Generic;
 using System.Text;
 
diff --git a/Source/OpenTK/Platform/IResizable.cs b/Source/OpenTK/Platform/IResizable.cs
index 017a6af8..7e66ed48 100644
--- a/Source/OpenTK/Platform/IResizable.cs
+++ b/Source/OpenTK/Platform/IResizable.cs
@@ -1,4 +1,10 @@
-using System;
+#region --- License ---
+/* Copyright (c) 2006, 2007 Stefanos Apostolopoulos
+ * See license.txt for license info
+ */
+#endregion
+
+using System;
 using System.Collections.Generic;
 using System.Text;
 
diff --git a/Source/OpenTK/Platform/IWindowInfo.cs b/Source/OpenTK/Platform/IWindowInfo.cs
index 28bb10f0..90d6df36 100644
--- a/Source/OpenTK/Platform/IWindowInfo.cs
+++ b/Source/OpenTK/Platform/IWindowInfo.cs
@@ -1,4 +1,10 @@
-using System;
+#region --- License ---
+/* Copyright (c) 2006, 2007 Stefanos Apostolopoulos
+ * See license.txt for license info
+ */
+#endregion
+
+using System;
 using System.Collections.Generic;
 using System.Text;
 
diff --git a/Source/OpenTK/Platform/Utilities.cs b/Source/OpenTK/Platform/Utilities.cs
index e939fe72..4fe7677b 100644
--- a/Source/OpenTK/Platform/Utilities.cs
+++ b/Source/OpenTK/Platform/Utilities.cs
@@ -1,4 +1,10 @@
-using System;
+#region --- License ---
+/* Copyright (c) 2006, 2007 Stefanos Apostolopoulos
+ * See license.txt for license info
+ */
+#endregion
+
+using System;
 using System.Collections.Generic;
 using System.Text;
 using System.Windows.Forms;
diff --git a/Source/OpenTK/Platform/Windows/WinRawMouse.cs b/Source/OpenTK/Platform/Windows/WinRawMouse.cs
index 8ac0ae86..41380aba 100644
--- a/Source/OpenTK/Platform/Windows/WinRawMouse.cs
+++ b/Source/OpenTK/Platform/Windows/WinRawMouse.cs
@@ -1,4 +1,10 @@
-using System;
+#region --- License ---
+/* Copyright (c) 2006, 2007 Stefanos Apostolopoulos
+ * See license.txt for license info
+ */
+#endregion
+
+using System;
 using System.Collections.Generic;
 using System.Text;
 
diff --git a/Source/OpenTK/Platform/Windows/WindowInfo.cs b/Source/OpenTK/Platform/Windows/WindowInfo.cs
index 11518c14..8ccb435a 100644
--- a/Source/OpenTK/Platform/Windows/WindowInfo.cs
+++ b/Source/OpenTK/Platform/Windows/WindowInfo.cs
@@ -1,4 +1,10 @@
-using System;
+#region --- License ---
+/* Copyright (c) 2006, 2007 Stefanos Apostolopoulos
+ * See license.txt for license info
+ */
+#endregion
+
+using System;
 using System.Collections.Generic;
 using System.Text;
 
diff --git a/Source/OpenTK/Platform/X11/WindowInfo.cs b/Source/OpenTK/Platform/X11/WindowInfo.cs
index 0e8fb81c..c396c1bc 100644
--- a/Source/OpenTK/Platform/X11/WindowInfo.cs
+++ b/Source/OpenTK/Platform/X11/WindowInfo.cs
@@ -1,4 +1,10 @@
-using System;
+#region --- License ---
+/* Copyright (c) 2006, 2007 Stefanos Apostolopoulos
+ * See license.txt for license info
+ */
+#endregion
+
+using System;
 using System.Collections.Generic;
 using System.Text;
 
@@ -10,20 +16,20 @@ namespace OpenTK.Platform.X11
     /// </summary>
     internal class WindowInfo : IWindowInfo
     {
-        internal WindowInfo()
-        {
-            visinfo = new VisualInfo();
+        internal WindowInfo()
+        {
+            visinfo = new VisualInfo();
         }
-        
+        
         internal WindowInfo(WindowInfo parent)
-        {
+        {
             this.Handle = parent.Handle;
             this.TopLevelWindow = parent.TopLevelWindow;
             this.Screen = parent.Screen;
             this.Display = parent.Display;
             this.RootWindow = parent.RootWindow;
             this.VisualInfo = parent.VisualInfo;
-            this.Parent = parent;
+            this.Parent = parent;
         }
 
         private IntPtr rootWindow, handle, topLevelWindow, display;
diff --git a/Source/OpenTK/Platform/X11/X11GLContext.cs b/Source/OpenTK/Platform/X11/X11GLContext.cs
index 57472efb..e2ff6515 100644
--- a/Source/OpenTK/Platform/X11/X11GLContext.cs
+++ b/Source/OpenTK/Platform/X11/X11GLContext.cs
@@ -23,7 +23,6 @@ namespace OpenTK.Platform.X11
 
         private DisplayMode mode;// = new DisplayMode();
         internal WindowInfo windowInfo;
-        private VisualInfo visualInfo;
 
         //private IntPtr desktopResolution = IntPtr.Zero;
 
@@ -31,8 +30,7 @@ namespace OpenTK.Platform.X11
         //private int stencilBits;
 
         // These have to be used by the X11GLControl.
-        internal IntPtr visual;
-        internal IntPtr colormap;
+        private IntPtr visual;
 
         private bool disposed;
 
@@ -72,7 +70,7 @@ namespace OpenTK.Platform.X11
                     "Making context {0} current on thread {1} (Display: {2}, Screen: {3}, Window: {4})... ",
                     x11context,
                     System.Threading.Thread.CurrentThread.ManagedThreadId,
-                    windowInfo.Display,
+                    windowInfo.Display,
                     windowInfo.Screen,
                     windowInfo.Handle
                 )
@@ -168,15 +166,15 @@ namespace OpenTK.Platform.X11
                 visual,
                 shareHandle,
                 direct
-            );
-            if (x11context != IntPtr.Zero)
+            );
+            if (x11context != IntPtr.Zero)
             {
                 Debug.WriteLine(String.Format("New opengl context created. (id: {0})", x11context));
-                Debug.Unindent();
-            }
-            else
-            {
-                throw new ApplicationException("Could not create opengl context.");
+                Debug.Unindent();
+            }
+            else
+            {
+                throw new ApplicationException("Could not create opengl context.");
             }
         }
 
@@ -188,14 +186,14 @@ namespace OpenTK.Platform.X11
         {
             Debug.WriteLine("Creating visual.");
             Debug.Indent();
-
+
             Debug.Print("Requesting DisplayMode: {0}. ", mode.ToString());
-            // Hack; Temp workaround for invalid depth of 24
-            //if (mode.DepthBits == 24)
-            //{
-            //    mode.DepthBits = 16;
-            //    Debug.WriteLine("Temporary workaround applied: depth changed to 16.");
-            //}
+            // Hack; Temp workaround for invalid depth of 24
+            //if (mode.DepthBits == 24)
+            //{
+            //    mode.DepthBits = 16;
+            //    Debug.WriteLine("Temporary workaround applied: depth changed to 16.");
+            //}
             
             List<int> visualAttributes = new List<int>();
             visualAttributes.Add((int)Glx.Enums.GLXAttribute.RGBA);
@@ -206,9 +204,9 @@ namespace OpenTK.Platform.X11
             visualAttributes.Add((int)Glx.Enums.GLXAttribute.BLUE_SIZE);
             visualAttributes.Add((int)mode.Color.Blue);
             visualAttributes.Add((int)Glx.Enums.GLXAttribute.ALPHA_SIZE);
-            visualAttributes.Add((int)mode.Color.Alpha);
+            visualAttributes.Add((int)mode.Color.Alpha);
             visualAttributes.Add((int)Glx.Enums.GLXAttribute.DEPTH_SIZE);
-            //visualAttributes.Add((int)mode.DepthBits);
+            //visualAttributes.Add((int)mode.DepthBits);
             visualAttributes.Add(1);
             visualAttributes.Add((int)Glx.Enums.GLXAttribute.DOUBLEBUFFER);
             visualAttributes.Add((int)Glx.Enums.GLXAttribute.NONE);
@@ -218,7 +216,7 @@ namespace OpenTK.Platform.X11
             {
                 throw new ApplicationException("Requested mode not available.");
             }
-            windowInfo.VisualInfo = (VisualInfo)Marshal.PtrToStructure(visual, typeof(VisualInfo));
+            windowInfo.VisualInfo = (VisualInfo)Marshal.PtrToStructure(visual, typeof(VisualInfo));
             Debug.Print("Got visual: {0}", windowInfo.VisualInfo.ToString());
 
             Debug.Unindent();
@@ -227,24 +225,18 @@ namespace OpenTK.Platform.X11
         }
 
         #endregion
-
+
         [Obsolete]
         internal IntPtr XVisual
         {
             get { return this.visual; }
         }
-
+
         internal VisualInfo XVisualInfo
         {
             get { return windowInfo.VisualInfo; }
         }
-
-        [Obsolete]
-        internal IntPtr XColormap
-        {
-            get { return colormap; }
-        }
-
+
         [Obsolete]
         internal IntPtr Handle
         {
diff --git a/Source/OpenTK/Platform/X11/X11Input.cs b/Source/OpenTK/Platform/X11/X11Input.cs
index 2d90dbde..b88a8bdf 100644
--- a/Source/OpenTK/Platform/X11/X11Input.cs
+++ b/Source/OpenTK/Platform/X11/X11Input.cs
@@ -1,4 +1,10 @@
-using System;
+#region --- License ---
+/* Copyright (c) 2006, 2007 Stefanos Apostolopoulos
+ * See license.txt for license info
+ */
+#endregion
+
+using System;
 using System.Collections.Generic;
 using System.Text;
 
diff --git a/Source/OpenTK/Platform/X11/X11Keyboard.cs b/Source/OpenTK/Platform/X11/X11Keyboard.cs
index ec8214b1..dc551bfa 100644
--- a/Source/OpenTK/Platform/X11/X11Keyboard.cs
+++ b/Source/OpenTK/Platform/X11/X11Keyboard.cs
@@ -1,4 +1,10 @@
-using System;
+#region --- License ---
+/* Copyright (c) 2006, 2007 Stefanos Apostolopoulos
+ * See license.txt for license info
+ */
+#endregion
+
+using System;
 using System.Collections.Generic;
 using System.Text;
 
diff --git a/Source/OpenTK/Platform/X11/X11Mouse.cs b/Source/OpenTK/Platform/X11/X11Mouse.cs
index 4a777f80..684f5ff5 100644
--- a/Source/OpenTK/Platform/X11/X11Mouse.cs
+++ b/Source/OpenTK/Platform/X11/X11Mouse.cs
@@ -1,4 +1,10 @@
-using System;
+#region --- License ---
+/* Copyright (c) 2006, 2007 Stefanos Apostolopoulos
+ * See license.txt for license info
+ */
+#endregion
+
+using System;
 using System.Collections.Generic;
 using System.Text;