From 3c51d81aa92450257ad1873710885140f67805bf Mon Sep 17 00:00:00 2001 From: the_fiddler Date: Wed, 19 Aug 2009 13:20:41 +0000 Subject: [PATCH] Marked all classes as obsolete. Silenced all compiler warnings. --- .../Fonts/IPrinterImplementation.cs | 1 + Source/Compatibility/Fonts/TextHandle.cs | 1 + .../Compatibility/Graphics/AlphaTexture2D.cs | 1 + .../Compatibility/Graphics/GL/ErrorHelper.cs | 1 + .../Compatibility/Graphics/RgbaTexture2D.cs | 1 + .../Graphics/Text/CachedGlyphInfo.cs | 1 + .../Graphics/Text/GL11TextOutputProvider.cs | 1 + .../Graphics/Text/GL12TextOutputProvider.cs | 1 + .../Graphics/Text/GL1TextOutputProvider.cs | 1 + .../Compatibility/Graphics/Text/GlyphCache.cs | 2 + .../Compatibility/Graphics/Text/GlyphSheet.cs | 1 + .../Graphics/Text/IGlyphCache.cs | 1 + Source/Compatibility/Graphics/TextPrinter.cs | 1 + Source/Compatibility/Graphics/Texture2D.cs | 1 + Source/Compatibility/Math/Quaternion.cs | 2 +- Source/Compatibility/Math/Quaterniond.cs | 2 +- .../Compatibility/Tao/OpenAl/ALDelegates.cs | 1 + Source/Compatibility/Tao/OpenGl/Glu.cs | 2 +- .../Windows/SimpleOpenGlControl.Designer.cs | 45 ++++++++ .../Platform/Windows/SimpleOpenGlControl.cs | 44 +------- .../Platform/Windows/SimpleOpenGlControl.resx | 101 ++++++++++++++++++ 21 files changed, 166 insertions(+), 46 deletions(-) create mode 100644 Source/Compatibility/Tao/Platform/Windows/SimpleOpenGlControl.Designer.cs create mode 100644 Source/Compatibility/Tao/Platform/Windows/SimpleOpenGlControl.resx diff --git a/Source/Compatibility/Fonts/IPrinterImplementation.cs b/Source/Compatibility/Fonts/IPrinterImplementation.cs index 08218bf9..5f51a45b 100644 --- a/Source/Compatibility/Fonts/IPrinterImplementation.cs +++ b/Source/Compatibility/Fonts/IPrinterImplementation.cs @@ -15,6 +15,7 @@ namespace OpenTK.Graphics /// Defines the interface for TextPrinter implementations. /// [Obsolete("Use ITextOutputProvider instead")] + [CLSCompliant(false)] public interface ITextPrinterImplementation { /// diff --git a/Source/Compatibility/Fonts/TextHandle.cs b/Source/Compatibility/Fonts/TextHandle.cs index 10cedf35..e730c7b5 100644 --- a/Source/Compatibility/Fonts/TextHandle.cs +++ b/Source/Compatibility/Fonts/TextHandle.cs @@ -35,6 +35,7 @@ namespace OpenTK.Graphics } private int handle; + [CLSCompliant(false)] protected TextureFont font; protected bool disposed; diff --git a/Source/Compatibility/Graphics/AlphaTexture2D.cs b/Source/Compatibility/Graphics/AlphaTexture2D.cs index 4ab43043..35044d09 100644 --- a/Source/Compatibility/Graphics/AlphaTexture2D.cs +++ b/Source/Compatibility/Graphics/AlphaTexture2D.cs @@ -37,6 +37,7 @@ namespace OpenTK.Graphics /// /// Encapsulates an OpenGL texture. /// + [Obsolete] class AlphaTexture2D : Texture2D { #region Constructors diff --git a/Source/Compatibility/Graphics/GL/ErrorHelper.cs b/Source/Compatibility/Graphics/GL/ErrorHelper.cs index 1296ad26..05b335d2 100644 --- a/Source/Compatibility/Graphics/GL/ErrorHelper.cs +++ b/Source/Compatibility/Graphics/GL/ErrorHelper.cs @@ -42,6 +42,7 @@ namespace OpenTK.Graphics // // Make sure that no error checking is added to the GetError function, // as that would cause infinite recursion! + [Obsolete] struct ErrorHelper : IDisposable { #region Fields diff --git a/Source/Compatibility/Graphics/RgbaTexture2D.cs b/Source/Compatibility/Graphics/RgbaTexture2D.cs index d010348c..c9494985 100644 --- a/Source/Compatibility/Graphics/RgbaTexture2D.cs +++ b/Source/Compatibility/Graphics/RgbaTexture2D.cs @@ -32,6 +32,7 @@ using OpenTK.Graphics.OpenGL; namespace OpenTK.Graphics { + [Obsolete] class RgbaTexture2D : Texture2D { public RgbaTexture2D(int width, int height) diff --git a/Source/Compatibility/Graphics/Text/CachedGlyphInfo.cs b/Source/Compatibility/Graphics/Text/CachedGlyphInfo.cs index f498d332..6f3986da 100644 --- a/Source/Compatibility/Graphics/Text/CachedGlyphInfo.cs +++ b/Source/Compatibility/Graphics/Text/CachedGlyphInfo.cs @@ -32,6 +32,7 @@ using System.Drawing; namespace OpenTK.Graphics.Text { + [Obsolete] struct CachedGlyphInfo { public readonly Texture2D Texture; diff --git a/Source/Compatibility/Graphics/Text/GL11TextOutputProvider.cs b/Source/Compatibility/Graphics/Text/GL11TextOutputProvider.cs index 3efeae24..b1af13ad 100644 --- a/Source/Compatibility/Graphics/Text/GL11TextOutputProvider.cs +++ b/Source/Compatibility/Graphics/Text/GL11TextOutputProvider.cs @@ -6,6 +6,7 @@ using OpenTK.Graphics.OpenGL; namespace OpenTK.Graphics.Text { + [Obsolete] sealed class GL11TextOutputProvider : GL1TextOutputProvider { #region Fields diff --git a/Source/Compatibility/Graphics/Text/GL12TextOutputProvider.cs b/Source/Compatibility/Graphics/Text/GL12TextOutputProvider.cs index e4dbe709..dd766e05 100644 --- a/Source/Compatibility/Graphics/Text/GL12TextOutputProvider.cs +++ b/Source/Compatibility/Graphics/Text/GL12TextOutputProvider.cs @@ -7,6 +7,7 @@ using OpenTK.Graphics.OpenGL; namespace OpenTK.Graphics.Text { + [Obsolete] sealed class GL12TextOutputProvider : GL1TextOutputProvider { #region Fields diff --git a/Source/Compatibility/Graphics/Text/GL1TextOutputProvider.cs b/Source/Compatibility/Graphics/Text/GL1TextOutputProvider.cs index 612ef693..cfd2c623 100644 --- a/Source/Compatibility/Graphics/Text/GL1TextOutputProvider.cs +++ b/Source/Compatibility/Graphics/Text/GL1TextOutputProvider.cs @@ -33,6 +33,7 @@ using OpenTK.Graphics.OpenGL; namespace OpenTK.Graphics.Text { + [Obsolete] abstract class GL1TextOutputProvider : ITextOutputProvider { #region Fields diff --git a/Source/Compatibility/Graphics/Text/GlyphCache.cs b/Source/Compatibility/Graphics/Text/GlyphCache.cs index 1059dba3..9833ce10 100644 --- a/Source/Compatibility/Graphics/Text/GlyphCache.cs +++ b/Source/Compatibility/Graphics/Text/GlyphCache.cs @@ -31,6 +31,7 @@ using System.Drawing; namespace OpenTK.Graphics.Text { + [Obsolete] abstract class GlyphCache : IGlyphCache { #region IGlyphCache Members @@ -48,6 +49,7 @@ namespace OpenTK.Graphics.Text #endregion } + [Obsolete] sealed class GlyphCache : GlyphCache where T : Texture2D { #region Fields diff --git a/Source/Compatibility/Graphics/Text/GlyphSheet.cs b/Source/Compatibility/Graphics/Text/GlyphSheet.cs index 0c63f7bb..65c5ba68 100644 --- a/Source/Compatibility/Graphics/Text/GlyphSheet.cs +++ b/Source/Compatibility/Graphics/Text/GlyphSheet.cs @@ -32,6 +32,7 @@ using System.Drawing; namespace OpenTK.Graphics.Text { + [Obsolete] class GlyphSheet : IDisposable where T : Texture2D { #region Fields diff --git a/Source/Compatibility/Graphics/Text/IGlyphCache.cs b/Source/Compatibility/Graphics/Text/IGlyphCache.cs index c6827891..ed485818 100644 --- a/Source/Compatibility/Graphics/Text/IGlyphCache.cs +++ b/Source/Compatibility/Graphics/Text/IGlyphCache.cs @@ -29,6 +29,7 @@ using System; namespace OpenTK.Graphics.Text { + [Obsolete] interface IGlyphCache : IDisposable { void Add(Glyph glyph, IGlyphRasterizer rasterizer, TextQuality quality); diff --git a/Source/Compatibility/Graphics/TextPrinter.cs b/Source/Compatibility/Graphics/TextPrinter.cs index 67d60320..d238799e 100644 --- a/Source/Compatibility/Graphics/TextPrinter.cs +++ b/Source/Compatibility/Graphics/TextPrinter.cs @@ -25,6 +25,7 @@ namespace OpenTK.Graphics /// /// Provides methods to perform layout and print hardware accelerated text. /// + [Obsolete] public sealed class TextPrinter : ITextPrinter { #region Fields diff --git a/Source/Compatibility/Graphics/Texture2D.cs b/Source/Compatibility/Graphics/Texture2D.cs index 1d85c742..56707aaa 100644 --- a/Source/Compatibility/Graphics/Texture2D.cs +++ b/Source/Compatibility/Graphics/Texture2D.cs @@ -34,6 +34,7 @@ using System.Diagnostics; namespace OpenTK.Graphics { + [Obsolete] abstract class Texture2D : IGraphicsResource, IEquatable { #region Fields diff --git a/Source/Compatibility/Math/Quaternion.cs b/Source/Compatibility/Math/Quaternion.cs index 84a8bf2f..10093f6d 100644 --- a/Source/Compatibility/Math/Quaternion.cs +++ b/Source/Compatibility/Math/Quaternion.cs @@ -279,7 +279,7 @@ namespace OpenTK.Math /// /// The left instance. /// The right instance. - /// The result of the operation. + /// The result of the operation. public static void Sub(ref Quaternion left, ref Quaternion right, out Quaternion result) { result = new Quaternion( diff --git a/Source/Compatibility/Math/Quaterniond.cs b/Source/Compatibility/Math/Quaterniond.cs index 2597d616..fe7e5377 100644 --- a/Source/Compatibility/Math/Quaterniond.cs +++ b/Source/Compatibility/Math/Quaterniond.cs @@ -279,7 +279,7 @@ namespace OpenTK.Math /// /// The left instance. /// The right instance. - /// The result of the operation. + /// The result of the operation. public static void Sub(ref Quaterniond left, ref Quaterniond right, out Quaterniond result) { result = new Quaterniond( diff --git a/Source/Compatibility/Tao/OpenAl/ALDelegates.cs b/Source/Compatibility/Tao/OpenAl/ALDelegates.cs index aebf1f3f..01e0c28c 100644 --- a/Source/Compatibility/Tao/OpenAl/ALDelegates.cs +++ b/Source/Compatibility/Tao/OpenAl/ALDelegates.cs @@ -30,6 +30,7 @@ namespace Tao.OpenAl using System; using System.Runtime.InteropServices; + [Obsolete] internal static class Delegates { static Delegates() diff --git a/Source/Compatibility/Tao/OpenGl/Glu.cs b/Source/Compatibility/Tao/OpenGl/Glu.cs index af86fe22..21ff729a 100644 --- a/Source/Compatibility/Tao/OpenGl/Glu.cs +++ b/Source/Compatibility/Tao/OpenGl/Glu.cs @@ -32743,7 +32743,7 @@ namespace Tao.OpenGl /// /// /// gluGetString is an initialization routine. Calling it after a - /// results in undefined behavior. + /// results in undefined behavior. /// /// /// ERRORS diff --git a/Source/Compatibility/Tao/Platform/Windows/SimpleOpenGlControl.Designer.cs b/Source/Compatibility/Tao/Platform/Windows/SimpleOpenGlControl.Designer.cs new file mode 100644 index 00000000..d6f7f9e7 --- /dev/null +++ b/Source/Compatibility/Tao/Platform/Windows/SimpleOpenGlControl.Designer.cs @@ -0,0 +1,45 @@ +namespace Tao.Platform.Windows +{ + partial class SimpleOpenGlControl + { + /// + /// Required designer variable. + /// + private System.ComponentModel.IContainer components = null; + + /// + /// Clean up any resources being used. + /// + /// true if managed resources should be disposed; otherwise, false. + protected override void Dispose(bool disposing) + { + if (disposing && (components != null)) + { + components.Dispose(); + } + base.Dispose(disposing); + } + + #region Component Designer generated code + + /// + /// Required method for Designer support - do not modify + /// the contents of this method with the code editor. + /// + private void InitializeComponent() + { + this.SuspendLayout(); + // + // NewGLControl + // + this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.BackColor = System.Drawing.Color.Black; + this.Name = "NewGLControl"; + this.ResumeLayout(false); + + } + + #endregion + } +} diff --git a/Source/Compatibility/Tao/Platform/Windows/SimpleOpenGlControl.cs b/Source/Compatibility/Tao/Platform/Windows/SimpleOpenGlControl.cs index 5e96cbda..8abfc87a 100644 --- a/Source/Compatibility/Tao/Platform/Windows/SimpleOpenGlControl.cs +++ b/Source/Compatibility/Tao/Platform/Windows/SimpleOpenGlControl.cs @@ -43,12 +43,10 @@ namespace Tao.Platform.Windows /// OpenGL applications. Relies on OpenTK.GLControl for cross-platform compatibility. /// [Obsolete("Use OpenTK.GLControl instead.")] - public class SimpleOpenGlControl : OpenTK.GLControl + public partial class SimpleOpenGlControl : OpenTK.GLControl { #region Fields - private IContainer components; // Required for designer support - private bool autoCheckErrors = false; // Should we provide glGetError()? private bool autoFinish = false; // Should we provide a glFinish()? private bool autoMakeCurrent = true; // Should we automatically make the rendering context current? @@ -425,23 +423,6 @@ namespace Tao.Platform.Windows #endregion - #region InitializeComponent - - /// - /// Required for designer support. - /// - private void InitializeComponent() - { - this.components = new System.ComponentModel.Container(); - // - // SimpleOpenGlControl - // - this.BackColor = System.Drawing.Color.Black; - this.Size = new System.Drawing.Size(50, 50); - } - - #endregion - #region InitializeStyles /// @@ -459,28 +440,5 @@ namespace Tao.Platform.Windows #endregion #endregion - - #region IDisposable Members - - #region Dispose(bool disposing) - /// - /// Disposes the control. - /// - /// Was the disposed manually called? - protected override void Dispose(bool disposing) - { - if (disposing) - { - if (components != null) - { - components.Dispose(); - } - } - DestroyContexts(); - base.Dispose(disposing); - } - #endregion Dispose(bool disposing) - - #endregion } } \ No newline at end of file diff --git a/Source/Compatibility/Tao/Platform/Windows/SimpleOpenGlControl.resx b/Source/Compatibility/Tao/Platform/Windows/SimpleOpenGlControl.resx new file mode 100644 index 00000000..85c90909 --- /dev/null +++ b/Source/Compatibility/Tao/Platform/Windows/SimpleOpenGlControl.resx @@ -0,0 +1,101 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 1.3 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.3500.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.3500.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + \ No newline at end of file