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

Ensured System.Windows.Forms.NativeWindow is resolved correctly.

Browse source 
Renamed OpenTK.NativeWindow0 to OpenTK.NativeWindow.
This commit is contained in:
the_fiddler 2009-08-21 19:34:20 +00:00
parent 9975aab0f9
commit 7970282d7b
4 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Source/OpenTK/GameWindow.cs
View file

@ -69,7 +69,7 @@ namespace OpenTK
/// parameters that /// parameters that
/// specify the logic update rate, and the render update rate. /// specify the logic update rate, and the render update rate.
/// </remarks> /// </remarks>
public class GameWindow : NativeWindow0, IGameWindow, IDisposable public class GameWindow : NativeWindow, IGameWindow, IDisposable
{ {
#region --- Fields --- #region --- Fields ---

14
Source/OpenTK/NativeWindow.cs
View file

@ -11,7 +11,7 @@ namespace OpenTK
/// <summary> /// <summary>
/// Instances of this class implement the <see cref="OpenTK.INativeWindow"/> interface on the current platform. /// Instances of this class implement the <see cref="OpenTK.INativeWindow"/> interface on the current platform.
/// </summary> /// </summary>
public class NativeWindow0 : INativeWindow public class NativeWindow : INativeWindow
{ {
#region --- Fields --- #region --- Fields ---
@ -26,7 +26,7 @@ namespace OpenTK
#region NativeWindow() #region NativeWindow()
/// <summary>Constructs a new NativeWindow with default attributes without enabling events.</summary> /// <summary>Constructs a new NativeWindow with default attributes without enabling events.</summary>
public NativeWindow0() public NativeWindow()
: this(640, 480, "OpenTK Native Window", GameWindowFlags.Default, GraphicsMode.Default, DisplayDevice.Default, false) { } : this(640, 480, "OpenTK Native Window", GameWindowFlags.Default, GraphicsMode.Default, DisplayDevice.Default, false) { }
#endregion #endregion
@ -35,7 +35,7 @@ namespace OpenTK
/// <summary>Constructs a new NativeWindow with default attributes.</summary> /// <summary>Constructs a new NativeWindow with default attributes.</summary>
/// <param name="enableEvents">Indicates to enable event processing as part of the NativeWindow construction.</param> /// <param name="enableEvents">Indicates to enable event processing as part of the NativeWindow construction.</param>
public NativeWindow0(bool enableEvents) public NativeWindow(bool enableEvents)
: this(640, 480, "OpenTK Native Window", GameWindowFlags.Default, GraphicsMode.Default, DisplayDevice.Default, enableEvents) { } : this(640, 480, "OpenTK Native Window", GameWindowFlags.Default, GraphicsMode.Default, DisplayDevice.Default, enableEvents) { }
#endregion #endregion
@ -53,7 +53,7 @@ namespace OpenTK
/// <param name="device">The OpenTK.Graphics.DisplayDevice to construct the NativeWindow in.</param> /// <param name="device">The OpenTK.Graphics.DisplayDevice to construct the NativeWindow in.</param>
/// <exception cref="System.ArgumentOutOfRangeException">If width or height is less than 1.</exception> /// <exception cref="System.ArgumentOutOfRangeException">If width or height is less than 1.</exception>
/// <exception cref="System.ArgumentNullException">If mode or device is null.</exception> /// <exception cref="System.ArgumentNullException">If mode or device is null.</exception>
public NativeWindow0(int width, int height, string title, GameWindowFlags options, GraphicsMode mode, DisplayDevice device) public NativeWindow(int width, int height, string title, GameWindowFlags options, GraphicsMode mode, DisplayDevice device)
: this(width, height, title, options, mode, device, false) { } : this(width, height, title, options, mode, device, false) { }
#endregion #endregion
@ -70,7 +70,7 @@ namespace OpenTK
/// <param name="enableEvents">Indicates to enable event processing as part of the NativeWindow construction.</param> /// <param name="enableEvents">Indicates to enable event processing as part of the NativeWindow construction.</param>
/// <exception cref="System.ArgumentOutOfRangeException">If width or height is less than 1.</exception> /// <exception cref="System.ArgumentOutOfRangeException">If width or height is less than 1.</exception>
/// <exception cref="System.ArgumentNullException">If mode or device is null.</exception> /// <exception cref="System.ArgumentNullException">If mode or device is null.</exception>
public NativeWindow0(int width, int height, string title, GameWindowFlags options, GraphicsMode mode, DisplayDevice device, bool enableEvents) public NativeWindow(int width, int height, string title, GameWindowFlags options, GraphicsMode mode, DisplayDevice device, bool enableEvents)
: this(device.Bounds.Left + (device.Bounds.Width - width) / 2, : this(device.Bounds.Left + (device.Bounds.Width - width) / 2,
device.Bounds.Top + (device.Bounds.Height - height) / 2, device.Bounds.Top + (device.Bounds.Height - height) / 2,
width, height, title, options, mode, device, enableEvents) { } width, height, title, options, mode, device, enableEvents) { }
@ -90,7 +90,7 @@ namespace OpenTK
/// <param name="device">The OpenTK.Graphics.DisplayDevice to construct the NativeWindow in.</param> /// <param name="device">The OpenTK.Graphics.DisplayDevice to construct the NativeWindow in.</param>
/// <exception cref="System.ArgumentOutOfRangeException">If width or height is less than 1.</exception> /// <exception cref="System.ArgumentOutOfRangeException">If width or height is less than 1.</exception>
/// <exception cref="System.ArgumentNullException">If mode or device is null.</exception> /// <exception cref="System.ArgumentNullException">If mode or device is null.</exception>
public NativeWindow0(int x, int y, int width, int height, string title, GameWindowFlags options, GraphicsMode mode, DisplayDevice device) public NativeWindow(int x, int y, int width, int height, string title, GameWindowFlags options, GraphicsMode mode, DisplayDevice device)
: this(x, y, width, height, title, options, mode, device, false) { } : this(x, y, width, height, title, options, mode, device, false) { }
#endregion #endregion
@ -109,7 +109,7 @@ namespace OpenTK
/// <param name="enableEvents">Indicates to enable event processing as part of the NativeWindow construction.</param> /// <param name="enableEvents">Indicates to enable event processing as part of the NativeWindow construction.</param>
/// <exception cref="System.ArgumentOutOfRangeException">If width or height is less than 1.</exception> /// <exception cref="System.ArgumentOutOfRangeException">If width or height is less than 1.</exception>
/// <exception cref="System.ArgumentNullException">If mode or device is null.</exception> /// <exception cref="System.ArgumentNullException">If mode or device is null.</exception>
public NativeWindow0(int x, int y, int width, int height, string title, GameWindowFlags options, GraphicsMode mode, DisplayDevice device, bool enableEvents) public NativeWindow(int x, int y, int width, int height, string title, GameWindowFlags options, GraphicsMode mode, DisplayDevice device, bool enableEvents)
{ {
// TODO: Should a constraint be added for the position? // TODO: Should a constraint be added for the position?
if (width < 1) if (width < 1)

2
Source/OpenTK/Platform/Windows/WMInput.cs
View file

@ -15,7 +15,7 @@ using System.Diagnostics;
namespace OpenTK.Platform.Windows namespace OpenTK.Platform.Windows
{ {
// Input driver for legacy (pre XP) Windows platforms. // Input driver for legacy (pre XP) Windows platforms.
sealed class WMInput : NativeWindow, IInputDriver sealed class WMInput : System.Windows.Forms.NativeWindow, IInputDriver
{ {
#region --- Fields --- #region --- Fields ---

2
Source/OpenTK/Platform/Windows/WinRawInput.cs
View file

@ -19,7 +19,7 @@ using OpenTK.Input;
namespace OpenTK.Platform.Windows namespace OpenTK.Platform.Windows
{ {
// Not complete. // Not complete.
sealed class WinRawInput : NativeWindow, IInputDriver sealed class WinRawInput : System.Windows.Forms.NativeWindow, IInputDriver
{ {
// Input event data. // Input event data.
RawInput data = new RawInput(); RawInput data = new RawInput();