mirror of
https://github.com/Ryujinx/Opentk.git
synced 2024-12-25 13:35:38 +00:00
Removed obsolete code.
Implemented X11GLNative.IconChanged event.
This commit is contained in:
parent
daed9943a8
commit
f46e9b1564
|
@ -99,11 +99,6 @@ namespace OpenTK.Platform
|
||||||
{
|
{
|
||||||
#region IPlatformFactory Members
|
#region IPlatformFactory Members
|
||||||
|
|
||||||
public INativeGLWindow CreateGLNative()
|
|
||||||
{
|
|
||||||
throw new PlatformNotSupportedException("Please, refer to http://www.opentk.com for more information.");
|
|
||||||
}
|
|
||||||
|
|
||||||
public INativeWindow CreateNativeWindow(int x, int y, int width, int height, string title, GraphicsMode mode, GameWindowFlags options, DisplayDevice device)
|
public INativeWindow CreateNativeWindow(int x, int y, int width, int height, string title, GraphicsMode mode, GameWindowFlags options, DisplayDevice device)
|
||||||
{
|
{
|
||||||
throw new PlatformNotSupportedException("Please, refer to http://www.opentk.com for more information.");
|
throw new PlatformNotSupportedException("Please, refer to http://www.opentk.com for more information.");
|
||||||
|
|
|
@ -114,12 +114,12 @@ namespace OpenTK.Platform.MacOS.Carbon
|
||||||
|
|
||||||
public static void Run(CarbonGLNative window)
|
public static void Run(CarbonGLNative window)
|
||||||
{
|
{
|
||||||
window.Destroy += MainWindowClosed;
|
window.Closed += MainWindowClosed;
|
||||||
window.Visible = true;
|
window.Visible = true;
|
||||||
|
|
||||||
API.RunApplicationEventLoop();
|
API.RunApplicationEventLoop();
|
||||||
|
|
||||||
window.Destroy -= MainWindowClosed;
|
window.Closed -= MainWindowClosed;
|
||||||
}
|
}
|
||||||
|
|
||||||
static void MainWindowClosed(object sender, EventArgs e)
|
static void MainWindowClosed(object sender, EventArgs e)
|
||||||
|
|
|
@ -676,9 +676,6 @@ namespace OpenTK.Platform.MacOS
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
public event CreateEvent Create = delegate(object sender, EventArgs e) { };
|
|
||||||
public event DestroyEvent Destroy = delegate(object sender, EventArgs e) { };
|
|
||||||
|
|
||||||
#endregion
|
#endregion
|
||||||
|
|
||||||
#region INativeGLWindow Members
|
#region INativeGLWindow Members
|
||||||
|
|
|
@ -954,20 +954,6 @@ namespace OpenTK.Platform.Windows
|
||||||
|
|
||||||
#endregion
|
#endregion
|
||||||
|
|
||||||
#region OnDestroy
|
|
||||||
|
|
||||||
public void OnDestroy(EventArgs e)
|
|
||||||
{
|
|
||||||
Debug.Print("Destroy event fired from window: {0}", window.ToString());
|
|
||||||
|
|
||||||
if (this.Destroy != null)
|
|
||||||
this.Destroy(this, e);
|
|
||||||
}
|
|
||||||
|
|
||||||
public event DestroyEvent Destroy;
|
|
||||||
|
|
||||||
#endregion
|
|
||||||
|
|
||||||
#endregion
|
#endregion
|
||||||
|
|
||||||
#region IInputDriver Members
|
#region IInputDriver Members
|
||||||
|
|
|
@ -778,6 +778,9 @@ namespace OpenTK.Platform.X11
|
||||||
}
|
}
|
||||||
set
|
set
|
||||||
{
|
{
|
||||||
|
if (value == icon)
|
||||||
|
return;
|
||||||
|
|
||||||
if (value == null)
|
if (value == null)
|
||||||
{
|
{
|
||||||
Functions.XDeleteProperty(window.Display, window.WindowHandle, _atom_net_wm_icon);
|
Functions.XDeleteProperty(window.Display, window.WindowHandle, _atom_net_wm_icon);
|
||||||
|
@ -807,6 +810,7 @@ namespace OpenTK.Platform.X11
|
||||||
}
|
}
|
||||||
|
|
||||||
icon = value;
|
icon = value;
|
||||||
|
IconChanged(this, EventArgs.Empty);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue