Rename delegates to try and stop name clashes, probably with wxWebKitCtrl.

[wxWidgets.git] / src / cocoa / NSControl.mm

diff --git a/src/cocoa/NSControl.mm b/src/cocoa/NSControl.mm
index 1e6a632de7e3d393085bae7a899237392e3ea2f6..0bcac4f44b091fb1a349ad7d1f1772238a2c1c4c 100644 (file)
--- a/src/cocoa/NSControl.mm
+++ b/src/cocoa/NSControl.mm
@@ -1,12 +1,12 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        cocoa/NSControl.cpp
+// Name:        src/cocoa/NSControl.mm
 // Purpose:     wxCocoaNSControl
 // Author:      David Elliott
 // Modified by:
 // Created:     2003/02/15
-// RCS-ID:      $Id: 
+// RCS-ID:      $Id$
 // Copyright:   (c) 2003 David Elliott
-// Licence:     wxWidgets licence
+// Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================
@@ -23,6 +23,7 @@
 #endif // WX_PRECOMP
 
 #include "wx/cocoa/objc/objc_uniquifying.h"
+#include "wx/cocoa/ObjcRef.h"
 #include "wx/cocoa/NSControl.h"
 
 #import <Foundation/NSObject.h>
@@ -56,5 +57,8 @@ WX_IMPLEMENT_GET_OBJC_CLASS(wxNSControlTarget,NSObject)
 // ============================================================================
 WX_IMPLEMENT_OBJC_INTERFACE(NSControl)
 
-struct objc_object *wxCocoaNSControl::sm_cocoaTarget = [[WX_GET_OBJC_CLASS(wxNSControlTarget) alloc] init];
+// New CF-retained observer (this should have been using wxObjcAutoRefFromAlloc to begin with)
+wxObjcAutoRefFromAlloc<wxNSControlTarget*> s_cocoaNSControlTarget = [[WX_GET_OBJC_CLASS(wxNSControlTarget) alloc] init];
+// For compatibility with old code
+struct objc_object *wxCocoaNSControl::sm_cocoaTarget = s_cocoaNSControlTarget;