ryujinx/Opentk
1
0
Fork 0
mirror of https://github.com/Ryujinx/Opentk.git synced 2025-06-19 13:17:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

[Mac] Avoid class conflicts for multiple windows

Browse source 
When creating multiple windows, their classes must have different class
names or they will fail to construct.

This commit ensures their names are unique. It also fixes a potential
memory leak in the Icon setter.
This commit is contained in:
thefiddler 2014-04-23 00:05:34 +02:00
parent 287c2b3415
commit b0eedc122d
1 changed files with 13 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1,14 +1,17 @@
using System; using System;
using OpenTK.Graphics;
using System.Drawing;
using System.ComponentModel; using System.ComponentModel;
using OpenTK.Input;
using System.Diagnostics; using System.Diagnostics;
using System.Drawing;
using System.Threading;
using OpenTK.Graphics;
using OpenTK.Input;
namespace OpenTK.Platform.MacOS namespace OpenTK.Platform.MacOS
{ {
class CocoaNativeWindow : INativeWindow class CocoaNativeWindow : INativeWindow
{ {
static volatile int UniqueId;
public event EventHandler<EventArgs> Move = delegate { }; public event EventHandler<EventArgs> Move = delegate { };
public event EventHandler<EventArgs> Resize = delegate { }; public event EventHandler<EventArgs> Resize = delegate { };
public event EventHandler<System.ComponentModel.CancelEventArgs> Closing = delegate { }; public event EventHandler<System.ComponentModel.CancelEventArgs> Closing = delegate { };
@ -118,7 +121,8 @@ namespace OpenTK.Platform.MacOS
public CocoaNativeWindow(int x, int y, int width, int height, string title, GraphicsMode mode, GameWindowFlags options, DisplayDevice device) public CocoaNativeWindow(int x, int y, int width, int height, string title, GraphicsMode mode, GameWindowFlags options, DisplayDevice device)
{ {
// Create the window class // Create the window class
windowClass = Class.AllocateClass("OpenTKWindow", "NSWindow"); Interlocked.Increment(ref UniqueId);
windowClass = Class.AllocateClass("OpenTKWindow" + UniqueId, "NSWindow");
Class.RegisterMethod(windowClass, new WindowDidResizeDelegate(WindowDidResize), "windowDidResize:", "v@:@"); Class.RegisterMethod(windowClass, new WindowDidResizeDelegate(WindowDidResize), "windowDidResize:", "v@:@");
Class.RegisterMethod(windowClass, new WindowDidMoveDelegate(WindowDidMove), "windowDidMove:", "v@:@"); Class.RegisterMethod(windowClass, new WindowDidMoveDelegate(WindowDidMove), "windowDidMove:", "v@:@");
Class.RegisterMethod(windowClass, new WindowDidBecomeKeyDelegate(WindowDidBecomeKey), "windowDidBecomeKey:", "v@:@"); Class.RegisterMethod(windowClass, new WindowDidBecomeKeyDelegate(WindowDidBecomeKey), "windowDidBecomeKey:", "v@:@");
@ -510,7 +514,11 @@ namespace OpenTK.Platform.MacOS
set set
{ {
icon = value; icon = value;
Cocoa.SendVoid(NSApplication.Handle, selSetApplicationIconImage, Cocoa.ToNSImage(icon.ToBitmap())); using (Image img = icon.ToBitmap())
{
IntPtr nsimg = Cocoa.ToNSImage(img);
Cocoa.SendVoid(NSApplication.Handle, selSetApplicationIconImage, nsimg);
}
IconChanged(this, EventArgs.Empty); IconChanged(this, EventArgs.Empty);
} }
} }