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

[Mac] Explicitly retain/release CocoaWindowInfo instances

Browse source
This commit is contained in:
thefiddler 2014-05-14 18:01:08 +02:00
parent 290cc91275
commit 1419c1e3a0
3 changed files with 10 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
Source/OpenTK/Platform/MacOS/Cocoa/Selector.cs
View file

@ -38,6 +38,7 @@ namespace OpenTK.Platform.MacOS
public static readonly IntPtr Init = Selector.Get("init"); public static readonly IntPtr Init = Selector.Get("init");
public static readonly IntPtr InitWithCoder = Selector.Get("initWithCoder:"); public static readonly IntPtr InitWithCoder = Selector.Get("initWithCoder:");
public static readonly IntPtr Alloc = Selector.Get("alloc"); public static readonly IntPtr Alloc = Selector.Get("alloc");
public static readonly IntPtr Retain = Selector.Get("retain");
public static readonly IntPtr Release = Selector.Get("release"); public static readonly IntPtr Release = Selector.Get("release");
public static readonly IntPtr Autorelease = Selector.Get("autorelease"); public static readonly IntPtr Autorelease = Selector.Get("autorelease");

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

@ -1021,7 +1021,7 @@ namespace OpenTK.Platform.MacOS
trackingArea = IntPtr.Zero; trackingArea = IntPtr.Zero;
} }
Cocoa.SendVoid(windowInfo.Handle, Selector.Release); windowInfo.Dispose();
} }
OnDisposed(EventArgs.Empty); OnDisposed(EventArgs.Empty);

9
Source/OpenTK/Platform/MacOS/CocoaWindowInfo.cs
View file

@ -68,6 +68,7 @@ namespace OpenTK.Platform.MacOS
{ {
this.nsWindowRef = nsWindowRef; this.nsWindowRef = nsWindowRef;
this.nsViewRef = nsViewRef; this.nsViewRef = nsViewRef;
Cocoa.SendVoid(nsWindowRef, Selector.Retain);
} }
#endregion #endregion
@ -107,16 +108,22 @@ namespace OpenTK.Platform.MacOS
if (disposing) if (disposing)
{ {
Cocoa.SendVoid(nsWindowRef, Selector.Release);
}
else
{
Debug.Print("CocoaWindowInfo:{0} leaked, did you forget to call Dispose()?", nsWindowRef);
} }
disposed = true; disposed = true;
} }
#if DEBUG
~CocoaWindowInfo() ~CocoaWindowInfo()
{ {
Dispose(false); Dispose(false);
} }
#endif
#endregion #endregion
} }