X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/7c5a378ff21de766bab2fd76293be1008610afc2..fab8784c715b09462d6b05dd93a3b4776cb205c9:/src/cocoa/NSView.mm diff --git a/src/cocoa/NSView.mm b/src/cocoa/NSView.mm index 5c4b2a5680..c37ebfb200 100644 --- a/src/cocoa/NSView.mm +++ b/src/cocoa/NSView.mm @@ -6,7 +6,7 @@ // Created: 2003/02/15 // RCS-ID: $Id$ // Copyright: (c) 2003 David Elliott -// Licence: wxWidgets licence +// Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// // ============================================================================ @@ -28,6 +28,7 @@ #import #import #include "wx/cocoa/objc/NSView.h" +#include "wx/cocoa/ObjcRef.h" // ---------------------------------------------------------------------------- // globals @@ -215,5 +216,7 @@ WX_DECLARE_GET_OBJC_CLASS(wxNSViewNotificationObserver,NSObject) @end // implementation wxNSViewNotificationObserver WX_IMPLEMENT_GET_OBJC_CLASS(wxNSViewNotificationObserver,NSObject) -void *wxCocoaNSView::sm_cocoaObserver = [[WX_GET_OBJC_CLASS(wxNSViewNotificationObserver) alloc] init]; - +// New CF-retained observer (this should have been using wxObjcAutoRefFromAlloc to begin with) +wxObjcAutoRefFromAlloc s_cocoaNSViewObserver([[WX_GET_OBJC_CLASS(wxNSViewNotificationObserver) alloc] init]); +// For compatibility with old code +id wxCocoaNSView::sm_cocoaObserver = s_cocoaNSViewObserver;