ryujinx/Opentk
1
0
Fork 0
mirror of https://github.com/Ryujinx/Opentk.git synced 2025-03-27 05:35:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

Cleaned up a number of obsolete warnings

Browse source
This commit is contained in:
thefiddler 2014-07-21 16:39:58 +02:00
parent 6d1149cccd
commit 461fbce45f
10 changed files with 17 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
Source/OpenTK/GameWindow.cs
View file

@ -78,8 +78,12 @@ namespace OpenTK
const double MaxFrequency = 500.0; // Frequency cap for Update/RenderFrame events
readonly Stopwatch watch = new Stopwatch();
#pragma warning disable 612,618
readonly IJoystickDriver LegacyJoystick =
Factory.Default.CreateLegacyJoystickDriver();
#pragma warning restore 612,618
IGraphicsContext glContext;

1
Source/OpenTK/Input/IInputDriver.cs
View file

@ -13,6 +13,7 @@ namespace OpenTK.Input
/// <summary>
/// Defines the interface for an input driver.
/// </summary>
[Obsolete("This interface has been replaced by OpenTK.Input.Keyboard, Mouse, Joystick and GamePad.")]
public interface IInputDriver : IKeyboardDriver, IMouseDriver, IJoystickDriver, IDisposable
{
/// <summary>

1
Source/OpenTK/Platform/Factory.cs
View file

@ -152,6 +152,7 @@ namespace OpenTK.Platform
return default_implementation.CreateJoystickDriver();
}
[Obsolete]
public IJoystickDriver CreateLegacyJoystickDriver()
{
return default_implementation.CreateLegacyJoystickDriver();

1
Source/OpenTK/Platform/IPlatformFactory.cs
View file

@ -53,6 +53,7 @@ namespace OpenTK.Platform
Input.IJoystickDriver2 CreateJoystickDriver();
[Obsolete]
Input.IJoystickDriver CreateLegacyJoystickDriver();
}
}

1
Source/OpenTK/Platform/LegacyInputDriver.cs
View file

@ -35,6 +35,7 @@ namespace OpenTK.Platform
{
// IInputDriver implementation to satisfy INativeWindow
// while reducing code duplication.
[Obsolete]
class LegacyInputDriver : IInputDriver
{
List<KeyboardDevice> dummy_keyboard_list = new List<KeyboardDevice>(1);

1
Source/OpenTK/Platform/MacOS/CocoaNativeWindow.cs
View file

@ -141,7 +141,6 @@ namespace OpenTK.Platform.MacOS
private int normalLevel;
private bool shouldClose;
private int suppressResize;
private bool cursorInsideWindow = true;
private MouseCursor selectedCursor = MouseCursor.Default; // user-selected cursor
public CocoaNativeWindow(int x, int y, int width, int height, string title, GraphicsMode mode, GameWindowFlags options, DisplayDevice device)

5
Source/OpenTK/Platform/NativeWindowBase.cs
View file

@ -38,7 +38,9 @@ namespace OpenTK.Platform
// Common base class for all INativeWindow implementations
abstract class NativeWindowBase : INativeWindow
{
#pragma warning disable 612,618
readonly LegacyInputDriver LegacyInputDriver;
#pragma warning restore 612,618
readonly MouseButtonEventArgs MouseDownArgs = new MouseButtonEventArgs();
readonly MouseButtonEventArgs MouseUpArgs = new MouseButtonEventArgs();
@ -58,7 +60,9 @@ namespace OpenTK.Platform
internal NativeWindowBase()
{
#pragma warning disable 612,618
LegacyInputDriver = new LegacyInputDriver(this);
#pragma warning restore 612,618
MouseState.SetIsConnected(true);
KeyboardState.SetIsConnected(true);
PreviousMouseState.SetIsConnected(true);
@ -445,6 +449,7 @@ namespace OpenTK.Platform
public abstract Size ClientSize { get; set; }
[Obsolete]
public virtual IInputDriver InputDriver
{
get

1
Source/OpenTK/Platform/PlatformFactoryBase.cs
View file

@ -74,6 +74,7 @@ namespace OpenTK.Platform
public abstract IJoystickDriver2 CreateJoystickDriver();
[Obsolete]
public virtual IJoystickDriver CreateLegacyJoystickDriver()
{
return new LegacyJoystickDriver();

4
Source/OpenTK/Platform/Windows/WinGLNative.cs
View file

@ -444,7 +444,7 @@ namespace OpenTK.Platform.Windows
else
{
// Exclude the current position.
Point currentScreenPosition = new Point(InputDriver.Mouse[0].X, InputDriver.Mouse[0].Y);
Point currentScreenPosition = new Point(MouseState.X, MouseState.Y);
Functions.ClientToScreen(handle, ref currentScreenPosition);
// Find the first move point we've already seen.
@ -867,7 +867,7 @@ namespace OpenTK.Platform.Windows
wc.WndProc = WindowProcedureDelegate;
wc.ClassName = ClassName;
wc.Icon = Icon != null ? Icon.Handle : IntPtr.Zero;
#warning "This seems to resize one of the 'large' icons, rather than using a small icon directly (multi-icon files). Investigate!"
// Todo: the following line appears to resize one of the 'large' icons, rather than using a small icon directly (multi-icon files). Investigate!
wc.IconSm = Icon != null ? new Icon(Icon, 16, 16).Handle : IntPtr.Zero;
wc.Cursor = Functions.LoadCursor(CursorName.Arrow);
ushort atom = Functions.RegisterClassEx(ref wc);

4
Source/OpenTK/Platform/X11/X11GLNative.cs
View file

@ -140,10 +140,8 @@ namespace OpenTK.Platform.X11
if (height <= 0)
throw new ArgumentOutOfRangeException("height", "Must be higher than zero.");
XVisualInfo info = new XVisualInfo();
Debug.Indent();
using (new XLock(window.Display))
{
IntPtr visual;