Marked all classes as obsolete.

Silenced all compiler warnings.
This commit is contained in:
the_fiddler 2009-08-19 13:20:41 +00:00
parent dcd76ebebf
commit 3c51d81aa9
21 changed files with 166 additions and 46 deletions

View file

@ -15,6 +15,7 @@ namespace OpenTK.Graphics
/// Defines the interface for TextPrinter implementations.
/// </summary>
[Obsolete("Use ITextOutputProvider instead")]
[CLSCompliant(false)]
public interface ITextPrinterImplementation
{
/// <summary>

View file

@ -35,6 +35,7 @@ namespace OpenTK.Graphics
}
private int handle;
[CLSCompliant(false)]
protected TextureFont font;
protected bool disposed;

View file

@ -37,6 +37,7 @@ namespace OpenTK.Graphics
/// <summary>
/// Encapsulates an OpenGL texture.
/// </summary>
[Obsolete]
class AlphaTexture2D : Texture2D
{
#region Constructors

View file

@ -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

View file

@ -32,6 +32,7 @@ using OpenTK.Graphics.OpenGL;
namespace OpenTK.Graphics
{
[Obsolete]
class RgbaTexture2D : Texture2D
{
public RgbaTexture2D(int width, int height)

View file

@ -32,6 +32,7 @@ using System.Drawing;
namespace OpenTK.Graphics.Text
{
[Obsolete]
struct CachedGlyphInfo
{
public readonly Texture2D Texture;

View file

@ -6,6 +6,7 @@ using OpenTK.Graphics.OpenGL;
namespace OpenTK.Graphics.Text
{
[Obsolete]
sealed class GL11TextOutputProvider : GL1TextOutputProvider
{
#region Fields

View file

@ -7,6 +7,7 @@ using OpenTK.Graphics.OpenGL;
namespace OpenTK.Graphics.Text
{
[Obsolete]
sealed class GL12TextOutputProvider : GL1TextOutputProvider
{
#region Fields

View file

@ -33,6 +33,7 @@ using OpenTK.Graphics.OpenGL;
namespace OpenTK.Graphics.Text
{
[Obsolete]
abstract class GL1TextOutputProvider : ITextOutputProvider
{
#region Fields

View file

@ -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<T> : GlyphCache where T : Texture2D
{
#region Fields

View file

@ -32,6 +32,7 @@ using System.Drawing;
namespace OpenTK.Graphics.Text
{
[Obsolete]
class GlyphSheet<T> : IDisposable where T : Texture2D
{
#region Fields

View file

@ -29,6 +29,7 @@ using System;
namespace OpenTK.Graphics.Text
{
[Obsolete]
interface IGlyphCache : IDisposable
{
void Add(Glyph glyph, IGlyphRasterizer rasterizer, TextQuality quality);

View file

@ -25,6 +25,7 @@ namespace OpenTK.Graphics
/// <summary>
/// Provides methods to perform layout and print hardware accelerated text.
/// </summary>
[Obsolete]
public sealed class TextPrinter : ITextPrinter
{
#region Fields

View file

@ -34,6 +34,7 @@ using System.Diagnostics;
namespace OpenTK.Graphics
{
[Obsolete]
abstract class Texture2D : IGraphicsResource, IEquatable<Texture2D>
{
#region Fields

View file

@ -279,7 +279,7 @@ namespace OpenTK.Math
/// </summary>
/// <param name="left">The left instance.</param>
/// <param name="right">The right instance.</param>
/// <returns>The result of the operation.</returns>
/// <param name="result">The result of the operation.</param>
public static void Sub(ref Quaternion left, ref Quaternion right, out Quaternion result)
{
result = new Quaternion(

View file

@ -279,7 +279,7 @@ namespace OpenTK.Math
/// </summary>
/// <param name="left">The left instance.</param>
/// <param name="right">The right instance.</param>
/// <returns>The result of the operation.</returns>
/// <param name="result">The result of the operation.</param>
public static void Sub(ref Quaterniond left, ref Quaterniond right, out Quaterniond result)
{
result = new Quaterniond(

View file

@ -30,6 +30,7 @@ namespace Tao.OpenAl
using System;
using System.Runtime.InteropServices;
[Obsolete]
internal static class Delegates
{
static Delegates()

View file

@ -32743,7 +32743,7 @@ namespace Tao.OpenGl
/// </para>
/// <para>
/// <b>gluGetString</b> is an initialization routine. Calling it after a
/// <see cref="Gl.glNewList" /> results in undefined behavior.
/// <see cref="Gl.glNewList(int, int)" /> results in undefined behavior.
/// </para>
/// <para>
/// <b>ERRORS</b>

View file

@ -0,0 +1,45 @@
namespace Tao.Platform.Windows
{
partial class SimpleOpenGlControl
{
/// <summary>
/// Required designer variable.
/// </summary>
private System.ComponentModel.IContainer components = null;
/// <summary>
/// Clean up any resources being used.
/// </summary>
/// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
protected override void Dispose(bool disposing)
{
if (disposing && (components != null))
{
components.Dispose();
}
base.Dispose(disposing);
}
#region Component Designer generated code
/// <summary>
/// Required method for Designer support - do not modify
/// the contents of this method with the code editor.
/// </summary>
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
}
}

View file

@ -43,12 +43,10 @@ namespace Tao.Platform.Windows
/// OpenGL applications. Relies on OpenTK.GLControl for cross-platform compatibility.
/// </summary>
[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
/// <summary>
/// Required for designer support.
/// </summary>
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
/// <summary>
@ -459,28 +440,5 @@ namespace Tao.Platform.Windows
#endregion
#endregion
#region IDisposable Members
#region Dispose(bool disposing)
/// <summary>
/// Disposes the control.
/// </summary>
/// <param name="disposing">Was the disposed manually called?</param>
protected override void Dispose(bool disposing)
{
if (disposing)
{
if (components != null)
{
components.Dispose();
}
}
DestroyContexts();
base.Dispose(disposing);
}
#endregion Dispose(bool disposing)
#endregion
}
}

View file

@ -0,0 +1,101 @@
<?xml version="1.0" encoding="utf-8"?>
<root>
<!--
Microsoft ResX Schema
Version 1.3
The primary goals of this format is to allow a simple XML format
that is mostly human readable. The generation and parsing of the
various data types are done through the TypeConverter classes
associated with the data types.
Example:
... ado.net/XML headers & schema ...
<resheader name="resmimetype">text/microsoft-resx</resheader>
<resheader name="version">1.3</resheader>
<resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
<resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
<data name="Name1">this is my long string</data>
<data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
<data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
[base64 mime encoded serialized .NET Framework object]
</data>
<data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
[base64 mime encoded string representing a byte array form of the .NET Framework object]
</data>
There are any number of "resheader" rows that contain simple
name/value pairs.
Each data row contains a name, and value. The row also contains a
type or mimetype. Type corresponds to a .NET class that support
text/value conversion through the TypeConverter architecture.
Classes that don't support this are serialized and stored with the
mimetype set.
The mimetype is used for serialized objects, and tells the
ResXResourceReader how to depersist the object. This is currently not
extensible. For a given mimetype the value must be set accordingly:
Note - application/x-microsoft.net.object.binary.base64 is the format
that the ResXResourceWriter will generate, however the reader can
read any of the formats listed below.
mimetype: application/x-microsoft.net.object.binary.base64
value : The object must be serialized with
: System.Serialization.Formatters.Binary.BinaryFormatter
: and then encoded with base64 encoding.
mimetype: application/x-microsoft.net.object.soap.base64
value : The object must be serialized with
: System.Runtime.Serialization.Formatters.Soap.SoapFormatter
: and then encoded with base64 encoding.
mimetype: application/x-microsoft.net.object.bytearray.base64
value : The object must be serialized into a byte array
: using a System.ComponentModel.TypeConverter
: and then encoded with base64 encoding.
-->
<xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
<xsd:element name="root" msdata:IsDataSet="true">
<xsd:complexType>
<xsd:choice maxOccurs="unbounded">
<xsd:element name="data">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
<xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
</xsd:sequence>
<xsd:attribute name="name" type="xsd:string" msdata:Ordinal="1" />
<xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
<xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
</xsd:complexType>
</xsd:element>
<xsd:element name="resheader">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
</xsd:sequence>
<xsd:attribute name="name" type="xsd:string" use="required" />
</xsd:complexType>
</xsd:element>
</xsd:choice>
</xsd:complexType>
</xsd:element>
</xsd:schema>
<resheader name="resmimetype">
<value>text/microsoft-resx</value>
</resheader>
<resheader name="version">
<value>1.3</value>
</resheader>
<resheader name="reader">
<value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.3500.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<resheader name="writer">
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.3500.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
</root>