Disabled OpenTK.Point, Size and Rectangle structures that were meant to replace their System.Drawing implementations until the correct course of action can be determined. This change is too disruptive to existing applications, especially if they are also using Windows.Forms (see discussion here: http://www.opentk.com/node/1348).
This commit is contained in:
parent
eedbe9df31
commit
c494250c3c
7 changed files with 13 additions and 10 deletions
|
@ -389,7 +389,7 @@ namespace OpenTK.Graphics.ES20
|
|||
{
|
||||
GL.Viewport(rectangle.X, rectangle.Y, rectangle.Width, rectangle.Height);
|
||||
}
|
||||
|
||||
#if NO_SYSDRAWING
|
||||
public static void Viewport(OpenTK.Point location, OpenTK.Size size)
|
||||
{
|
||||
GL.Viewport(location.X, location.Y, size.Width, size.Height);
|
||||
|
@ -399,7 +399,7 @@ namespace OpenTK.Graphics.ES20
|
|||
{
|
||||
GL.Viewport(rectangle.X, rectangle.Y, rectangle.Width, rectangle.Height);
|
||||
}
|
||||
|
||||
#endif
|
||||
#endregion
|
||||
|
||||
#pragma warning restore 3019
|
||||
|
|
|
@ -826,7 +826,7 @@ namespace OpenTK.Graphics.OpenGL
|
|||
{
|
||||
GL.Viewport(rectangle.X, rectangle.Y, rectangle.Width, rectangle.Height);
|
||||
}
|
||||
|
||||
#if NO_SYSDRAWING
|
||||
public static void Viewport(OpenTK.Point location, OpenTK.Size size)
|
||||
{
|
||||
GL.Viewport(location.X, location.Y, size.Width, size.Height);
|
||||
|
@ -836,7 +836,7 @@ namespace OpenTK.Graphics.OpenGL
|
|||
{
|
||||
GL.Viewport(rectangle.X, rectangle.Y, rectangle.Width, rectangle.Height);
|
||||
}
|
||||
|
||||
#endif
|
||||
#endregion
|
||||
|
||||
#region TexEnv
|
||||
|
|
|
@ -31,6 +31,7 @@ using System.Text;
|
|||
|
||||
namespace OpenTK
|
||||
{
|
||||
#if NO_SYSDRAWING
|
||||
/// <summary>
|
||||
/// Defines a point on a two-dimensional plane.
|
||||
/// </summary>
|
||||
|
@ -230,4 +231,5 @@ namespace OpenTK
|
|||
|
||||
#endregion
|
||||
}
|
||||
#endif
|
||||
}
|
||||
|
|
|
@ -31,6 +31,7 @@ using System.Text;
|
|||
|
||||
namespace OpenTK
|
||||
{
|
||||
#if NO_SYSDRAWING
|
||||
/// <summary>
|
||||
/// Represents a rectangular region on a two-dimensional plane.
|
||||
/// </summary>
|
||||
|
@ -318,4 +319,5 @@ namespace OpenTK
|
|||
|
||||
#endregion
|
||||
}
|
||||
#endif
|
||||
}
|
||||
|
|
|
@ -31,6 +31,7 @@ using System.Text;
|
|||
|
||||
namespace OpenTK
|
||||
{
|
||||
#if NO_SYSDRAWING
|
||||
/// <summary>
|
||||
/// Stores the width and height of a rectangle.
|
||||
/// </summary>
|
||||
|
@ -217,4 +218,5 @@ namespace OpenTK
|
|||
|
||||
#endregion
|
||||
}
|
||||
#endif
|
||||
}
|
||||
|
|
|
@ -1,11 +1,10 @@
|
|||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Diagnostics;
|
||||
using System.Text;
|
||||
|
||||
namespace OpenTK.Platform.MacOS
|
||||
{
|
||||
using Graphics;
|
||||
using System.Drawing;
|
||||
using Carbon;
|
||||
|
||||
class QuartzDisplayDeviceDriver : IDisplayDeviceDriver
|
||||
|
|
|
@ -8,11 +8,9 @@
|
|||
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Runtime.InteropServices;
|
||||
using System.Text;
|
||||
|
||||
using OpenTK.Graphics;
|
||||
using System.Diagnostics;
|
||||
using System.Drawing;
|
||||
using System.Runtime.InteropServices;
|
||||
|
||||
namespace OpenTK.Platform.X11
|
||||
{
|
||||
|
|
Loading…
Reference in a new issue