mirror of
https://github.com/Ryujinx/Opentk.git
synced 2024-12-26 16:25:27 +00:00
Public X11 classes made internal.
This commit is contained in:
parent
95838acb4f
commit
69a1168f3d
|
@ -272,7 +272,7 @@ namespace OpenTK
|
||||||
|
|
||||||
public X11PlatformIdle(WindowInfo info)
|
public X11PlatformIdle(WindowInfo info)
|
||||||
{
|
{
|
||||||
display = ((OpenTK.Platform.X11.WindowInfo)info).Display;
|
display = new OpenTK.Platform.X11.WindowInfo(info).Display;//((OpenTK.Platform.X11.WindowInfo)info).Display;
|
||||||
}
|
}
|
||||||
|
|
||||||
#region IPlatformIdle Members
|
#region IPlatformIdle Members
|
||||||
|
|
|
@ -137,15 +137,15 @@ namespace OpenTK.Platform
|
||||||
implementation.CopyInfoFrom(info);
|
implementation.CopyInfoFrom(info);
|
||||||
}
|
}
|
||||||
|
|
||||||
public static explicit operator Windows.WindowInfo(WindowInfo info)
|
//public static explicit operator Windows.WindowInfo(WindowInfo info)
|
||||||
{
|
//{
|
||||||
return (Windows.WindowInfo)info.implementation;
|
// return (Windows.WindowInfo)info.implementation;
|
||||||
}
|
//}
|
||||||
|
|
||||||
public static explicit operator X11.WindowInfo(WindowInfo info)
|
//public static explicit operator X11.WindowInfo(WindowInfo info)
|
||||||
{
|
//{
|
||||||
return (X11.WindowInfo)info.implementation;
|
// return (X11.WindowInfo)info.implementation;
|
||||||
}
|
//}
|
||||||
|
|
||||||
#endregion
|
#endregion
|
||||||
}
|
}
|
||||||
|
|
|
@ -5,7 +5,7 @@ using System.Runtime.InteropServices;
|
||||||
|
|
||||||
namespace OpenTK.Platform.X11
|
namespace OpenTK.Platform.X11
|
||||||
{
|
{
|
||||||
public static partial class Functions
|
internal static partial class Functions
|
||||||
{
|
{
|
||||||
[DllImport("libX11", EntryPoint = "XOpenDisplay")]
|
[DllImport("libX11", EntryPoint = "XOpenDisplay")]
|
||||||
public extern static IntPtr XOpenDisplay(IntPtr display);
|
public extern static IntPtr XOpenDisplay(IntPtr display);
|
||||||
|
|
|
@ -15,7 +15,7 @@ namespace OpenTK.Platform.X11
|
||||||
/// Describes a Windows.Form.Control, Windows.Forms.NativeWindow or OpenTK.GameWindow on the X11 platform.
|
/// Describes a Windows.Form.Control, Windows.Forms.NativeWindow or OpenTK.GameWindow on the X11 platform.
|
||||||
/// This class supports OpenTK, and is not intended for use by OpenTK programs.
|
/// This class supports OpenTK, and is not intended for use by OpenTK programs.
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public sealed class WindowInfo : IMutableWindowInfo
|
internal sealed class WindowInfo : IMutableWindowInfo
|
||||||
{
|
{
|
||||||
private IntPtr handle, topLevelWindow;
|
private IntPtr handle, topLevelWindow;
|
||||||
private IntPtr rootWindow, display;
|
private IntPtr rootWindow, display;
|
||||||
|
@ -117,7 +117,7 @@ namespace OpenTK.Platform.X11
|
||||||
// X11.WindowInfo winfo = info as X11.WindowInfo ?? (X11.WindowInfo)(info as Platform.WindowInfo);
|
// X11.WindowInfo winfo = info as X11.WindowInfo ?? (X11.WindowInfo)(info as Platform.WindowInfo);
|
||||||
X11.WindowInfo winfo = info as X11.WindowInfo;
|
X11.WindowInfo winfo = info as X11.WindowInfo;
|
||||||
if (winfo == null)
|
if (winfo == null)
|
||||||
winfo = (X11.WindowInfo)(info as Platform.WindowInfo);
|
winfo = new WindowInfo(info);//(X11.WindowInfo)(info as Platform.WindowInfo);
|
||||||
|
|
||||||
this.RootWindow = winfo.RootWindow;
|
this.RootWindow = winfo.RootWindow;
|
||||||
this.TopLevelWindow = winfo.TopLevelWindow;
|
this.TopLevelWindow = winfo.TopLevelWindow;
|
||||||
|
|
Loading…
Reference in a new issue