From f9fc027bb42f2b8232a49ce7ce7027cb06ccce55 Mon Sep 17 00:00:00 2001 From: the_fiddler Date: Tue, 14 Aug 2007 16:57:25 +0000 Subject: [PATCH] Removed unused code files. Changed endings to CRLF. --- Source/Bind/GL2/SpecReader.cs | 59 ---------------------- Source/Bind/GL2/SpecWriter.cs | 27 ---------- Source/OpenTK/OpenGL/Bindings/WglHelper.cs | 3 +- Source/OpenTK/Platform/X11/X11GLControl.cs | 28 +++++----- 4 files changed, 16 insertions(+), 101 deletions(-) delete mode 100644 Source/Bind/GL2/SpecReader.cs delete mode 100644 Source/Bind/GL2/SpecWriter.cs diff --git a/Source/Bind/GL2/SpecReader.cs b/Source/Bind/GL2/SpecReader.cs deleted file mode 100644 index 576b634d..00000000 --- a/Source/Bind/GL2/SpecReader.cs +++ /dev/null @@ -1,59 +0,0 @@ -#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; -using System.Diagnostics; - -namespace Bind.GL2 -{ - class SpecReader : ISpecReader - { - #region --- ISpecReader Members --- - - #region public virtual DelegateCollection ReadDelegates(System.IO.StreamReader specFile) - - public virtual DelegateCollection ReadDelegates(System.IO.StreamReader specFile) - { - - } - - #endregion - - #region public virtual EnumCollection ReadEnums(System.IO.StreamReader specFile) - - public virtual EnumCollection ReadEnums(System.IO.StreamReader specfile) - { - - } - - #endregion - - #region public virtual Dictionary ReadTypeMap(System.IO.StreamReader sr) - - public virtual Dictionary ReadTypeMap(System.IO.StreamReader sr) - { - - } - - #endregion - - #region public virtual Dictionary ReadCSTypeMap(System.IO.StreamReader sr) - - public virtual Dictionary ReadCSTypeMap(System.IO.StreamReader sr) - { - - } - - #endregion - - #endregion - - - } -} diff --git a/Source/Bind/GL2/SpecWriter.cs b/Source/Bind/GL2/SpecWriter.cs deleted file mode 100644 index 54948021..00000000 --- a/Source/Bind/GL2/SpecWriter.cs +++ /dev/null @@ -1,27 +0,0 @@ -#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; -using System.Diagnostics; - -namespace Bind.GL2 -{ - class SpecWriter : ISpecWriter - { - #region --- ISpecWriter Members --- - - - - - - - - #endregion - } -} diff --git a/Source/OpenTK/OpenGL/Bindings/WglHelper.cs b/Source/OpenTK/OpenGL/Bindings/WglHelper.cs index ed19eb06..ddd2b78d 100644 --- a/Source/OpenTK/OpenGL/Bindings/WglHelper.cs +++ b/Source/OpenTK/OpenGL/Bindings/WglHelper.cs @@ -8,6 +8,7 @@ #endregion using System; +using System.Runtime.InteropServices; namespace OpenTK.OpenGL { @@ -41,7 +42,7 @@ namespace OpenTK.OpenGL public static Delegate Load(string function, Type signature) { - + return null; } } } diff --git a/Source/OpenTK/Platform/X11/X11GLControl.cs b/Source/OpenTK/Platform/X11/X11GLControl.cs index 7505ecff..c3eaee9b 100644 --- a/Source/OpenTK/Platform/X11/X11GLControl.cs +++ b/Source/OpenTK/Platform/X11/X11GLControl.cs @@ -24,31 +24,31 @@ namespace OpenTK.Platform.X11 private bool fullscreen; #region --- Contructors --- - + [Obsolete("Use X11GLControl(UserControl c, DisplayMode mode) instead.")] - public X11GLControl(UserControl c, int width, int height, bool fullscreen) - : this(c, new DisplayMode(width, height, new ColorDepth(32), 16, - 0, 0, 2, false, false, false, 0.0f)) { } - - public X11GLControl(UserControl c, DisplayMode mode) + public X11GLControl(UserControl c, int width, int height, bool fullscreen) + : this(c, new DisplayMode(width, height, new ColorDepth(32), 16, + 0, 0, 2, false, false, false, 0.0f)) { } + + public X11GLControl(UserControl c, DisplayMode mode) { Debug.WriteLine("Creating opengl control (X11GLControl driver)"); Debug.Indent(); - + if (c == null/* || c.TopLevelControl == null*/) { throw new ArgumentException("UserControl c may not be null."); } c.ParentChanged += new EventHandler(c_ParentChanged); - if (c.ParentForm != null) + if (c.ParentForm != null) { - throw new ApplicationException("Internal OpenTK error, please report at http://opentk.sourceforge.net"); + throw new ApplicationException("Internal OpenTK error, please report at http://opentk.sourceforge.net"); } info.Handle = c.Handle; Debug.Print("Binding to control: {0}", String.IsNullOrEmpty(c.Name) ? c.Text : c.Name); - + xplatui = Type.GetType("System.Windows.Forms.XplatUIX11, System.Windows.Forms"); Debug.Write("System.Windows.Forms.XplatUIX11: "); @@ -69,7 +69,7 @@ namespace OpenTK.Platform.X11 Debug.Print( "Screen: {0}, Display: {1}, Root Window: {2}, Handle: {3}", info.Screen, info.Display, info.RootWindow, info.Handle); - + glContext = new X11GLContext(info, mode); info.VisualInfo = glContext.CreateVisual(); @@ -79,7 +79,7 @@ namespace OpenTK.Platform.X11 System.Reflection.BindingFlags.Static | System.Reflection.BindingFlags.NonPublic).SetValue( null, - //glContext.XVisual + //glContext.XVisual info.VisualInfo.visual ); @@ -87,8 +87,8 @@ namespace OpenTK.Platform.X11 "CustomColormap", System.Reflection.BindingFlags.Static | System.Reflection.BindingFlags.NonPublic).SetValue( - null, - API.CreateColormap(info.Display, info.RootWindow, info.VisualInfo.visual, 0/*AllocNone*/) + null, + API.CreateColormap(info.Display, info.RootWindow, info.VisualInfo.visual, 0/*AllocNone*/) //glContext.colormap );