]> git.saurik.com Git - wxWidgets.git/commitdiff
Fix (at least) slider action messages in GC mode.
authorDavid Elliott <dfe@tgwbd.org>
Wed, 13 Feb 2008 20:30:36 +0000 (20:30 +0000)
committerDavid Elliott <dfe@tgwbd.org>
Wed, 13 Feb 2008 20:30:36 +0000 (20:30 +0000)
Copyright 2008 Software 2000 Ltd.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@51766 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

src/cocoa/NSControl.mm

index 1e6a632de7e3d393085bae7a899237392e3ea2f6..6c3f4a22fce63d8b6bdeffef2d00fba56bf411ec 100644 (file)
@@ -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;