Removed obsolete functions which accessed the obsolete joystick driver.

This commit is contained in:
Jarl Gullberg 2017-06-20 15:54:28 +02:00
parent 8719556315
commit a5581d94af
No known key found for this signature in database
GPG key ID: 750FF6F6BDA72D23
3 changed files with 3 additions and 33 deletions

View file

@ -79,12 +79,6 @@ namespace OpenTK
readonly Stopwatch watch = new Stopwatch();
#pragma warning disable 612,618
readonly IJoystickDriver LegacyJoystick =
Factory.Default.CreateLegacyJoystickDriver();
#pragma warning restore 612,618
IGraphicsContext glContext;
bool isExiting = false;
@ -581,19 +575,6 @@ namespace OpenTK
#endregion
#region Joysticks
/// <summary>
/// Gets a readonly IList containing all available OpenTK.Input.JoystickDevices.
/// </summary>
[Obsolete("Use OpenTK.Input.Joystick and GamePad instead")]
public IList<JoystickDevice> Joysticks
{
get { return LegacyJoystick.Joysticks; }
}
#endregion
#region --- GameWindow Timing ---
// TODO: Disabled because it is not reliable enough. Use vsync as a workaround.

View file

@ -440,9 +440,6 @@
<Compile Include="Input\IJoystickDriver.cs">
<SubType>Code</SubType>
</Compile>
<Compile Include="Input\IMouseDriver.cs">
<SubType>Code</SubType>
</Compile>
<Compile Include="Input\IInputDriver.cs">
<SubType>Code</SubType>
</Compile>

View file

@ -6,7 +6,7 @@
//
// Permission is hereby granted, free of charge, to any person obtaining a copy
// of this software and associated documentation files (the "Software"), to deal
// in the Software without restriction, including without limitation the rights to
// in the Software without restriction, including without limitation the rights to
// use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
// the Software, and to permit persons to whom the Software is furnished to do
// so, subject to the following conditions:
@ -192,14 +192,6 @@ namespace OpenTK.Platform
return defaultImplementation.CreateJoystickDriver();
}
[Obsolete]
public IJoystickDriver CreateLegacyJoystickDriver()
{
#pragma warning disable 612,618
return defaultImplementation.CreateLegacyJoystickDriver();
#pragma warning restore 612,618
}
public void RegisterResource(IDisposable resource)
{
defaultImplementation.RegisterResource(resource);
@ -210,9 +202,9 @@ namespace OpenTK.Platform
#region Fields
static readonly string error_string = "Please, refer to http://www.opentk.com for more information.";
#endregion
#region IPlatformFactory Members
public override INativeWindow CreateNativeWindow(int x, int y, int width, int height, string title, GraphicsMode mode, GameWindowFlags options, DisplayDevice device)