Fix out of bounds string access in wxMSW wxDirDialog.

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

diff --git a/src/cocoa/NSControl.mm b/src/cocoa/NSControl.mm
index 01bd97f2979f6b3d318e5c567534321c885faa71..9e1d550329cb5044bec0c7046769e515cfd18b54 100644 (file)
--- a/src/cocoa/NSControl.mm
+++ b/src/cocoa/NSControl.mm
@@ -4,9 +4,9 @@
 // Author:      David Elliott
 // Modified by:
 // Created:     2003/02/15
 // Author:      David Elliott
 // Modified by:
 // Created:     2003/02/15

-// RCS-ID:      $Id: 
+// RCS-ID:      $Id$

 // Copyright:   (c) 2003 David Elliott
 // Copyright:   (c) 2003 David Elliott

-// Licence:     wxWindows license
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================
 /////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================


@@ -19,12 +19,46 @@
 
 #include "wx/wxprec.h"
 #ifndef WX_PRECOMP
 
 #include "wx/wxprec.h"
 #ifndef WX_PRECOMP

+    #include "wx/log.h"

 #endif // WX_PRECOMP
 
 #endif // WX_PRECOMP
 

+#include "wx/cocoa/objc/objc_uniquifying.h"
+#include "wx/cocoa/ObjcRef.h"

 #include "wx/cocoa/NSControl.h"
 
 #include "wx/cocoa/NSControl.h"
 

-// ----------------------------------------------------------------------------
-// globals
-// ----------------------------------------------------------------------------
+#import <Foundation/NSObject.h>
+
+// ============================================================================
+// @class wxNSControlTarget
+// ============================================================================
+@interface wxNSControlTarget : NSObject
+{
+}
+
+- (void)wxNSControlAction: (id)sender;
+@end //interface wxNSControlTarget
+WX_DECLARE_GET_OBJC_CLASS(wxNSControlTarget,NSObject)
+
+@implementation wxNSControlTarget : NSObject
+
+- (void)wxNSControlAction: (id)sender
+{
+    wxLogTrace(wxTRACE_COCOA,wxT("wxNSControlAction"));
+    wxCocoaNSControl *wxcontrol = wxCocoaNSControl::GetFromCocoa(sender);
+    wxCHECK_RET(wxcontrol,wxT("wxNSControlAction received but no wxCocoaNSControl exists!"));
+    wxcontrol->CocoaTarget_action();
+}
+
+@end //implementation wxNSControlTarget
+WX_IMPLEMENT_GET_OBJC_CLASS(wxNSControlTarget,NSObject)
+
+// ============================================================================
+// wxNSControl
+// ============================================================================

 WX_IMPLEMENT_OBJC_INTERFACE(NSControl)
 
 WX_IMPLEMENT_OBJC_INTERFACE(NSControl)
 

+// 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;
+