X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/76adcbf2d1e2a0b47abec763e327ed716c97950d..76e7cfab8fdb0c7862fd07e427af54181717fc62:/src/cocoa/NSWindow.mm diff --git a/src/cocoa/NSWindow.mm b/src/cocoa/NSWindow.mm index 7152f6c47b..514a35cade 100644 --- a/src/cocoa/NSWindow.mm +++ b/src/cocoa/NSWindow.mm @@ -4,9 +4,8 @@ // Author: David Elliott // Modified by: // Created: 2003/03/16 -// RCS-ID: $Id$ // Copyright: (c) 2003 David Elliott -// Licence: wxWidgets licence +// Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// // ============================================================================ @@ -25,6 +24,8 @@ #include "wx/cocoa/NSWindow.h" +#include "wx/cocoa/objc/objc_uniquifying.h" + #import #import #include "wx/cocoa/objc/NSWindow.h" @@ -53,6 +54,7 @@ - (void)wxMenuItemAction: (NSMenuItem *)menuItem; - (BOOL)validateMenuItem: (NSMenuItem *)menuItem; @end //interface wxNSWindowDelegate +WX_DECLARE_GET_OBJC_CLASS(wxNSWindowDelegate,NSObject) @implementation wxNSWindowDelegate : NSObject @@ -141,6 +143,7 @@ } @end //implementation wxNSWindowDelegate +WX_IMPLEMENT_GET_OBJC_CLASS(wxNSWindowDelegate,NSObject) // ============================================================================ // class wxCocoaNSWindow @@ -151,7 +154,7 @@ WX_IMPLEMENT_OBJC_INTERFACE_HASHMAP(NSWindow) wxCocoaNSWindow::wxCocoaNSWindow(wxTopLevelWindowCocoa *tlw) : m_wxTopLevelWindowCocoa(tlw) { - m_cocoaDelegate = [[wxNSWindowDelegate alloc] init]; + m_cocoaDelegate = [[WX_GET_OBJC_CLASS(wxNSWindowDelegate) alloc] init]; [m_cocoaDelegate setWxCocoaInterface: this]; } @@ -209,6 +212,7 @@ wxMenuBar* wxCocoaNSWindow::GetAppMenuBar(wxCocoaNSWindow *win) } @end // implementation WXNSWindow +WX_IMPLEMENT_GET_OBJC_CLASS(WXNSWindow,NSWindow) // ============================================================================ // @class WXNSPanel @@ -234,3 +238,4 @@ wxMenuBar* wxCocoaNSWindow::GetAppMenuBar(wxCocoaNSWindow *win) } @end // implementation WXNSPanel +WX_IMPLEMENT_GET_OBJC_CLASS(WXNSPanel,NSPanel)