X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/2b030203c5926bd6af8bc310469c911f2143f7e1..f6f735d3c225ac1d308dfaf3c57e1af5e0db10b6:/src/cocoa/NSButton.mm diff --git a/src/cocoa/NSButton.mm b/src/cocoa/NSButton.mm index 63cf30df2f..e2436fca0a 100644 --- a/src/cocoa/NSButton.mm +++ b/src/cocoa/NSButton.mm @@ -4,9 +4,9 @@ // Author: David Elliott // Modified by: // Created: 2003/01/31 -// RCS-ID: $Id: -// Copyright: (c) 2003 David Elliott -// Licence: wxWindows license +// RCS-ID: $Id$ +// Copyright: (c) 2003-2004 David Elliott +// Licence: wxWidgets licence ///////////////////////////////////////////////////////////////////////////// // ============================================================================ @@ -22,8 +22,6 @@ #include "wx/log.h" #endif // WX_PRECOMP -#include "wx/cocoa/ObjcPose.h" - #include "wx/cocoa/NSButton.h" #import @@ -33,34 +31,36 @@ WX_IMPLEMENT_OBJC_INTERFACE_HASHMAP(NSButton) // ============================================================================ -// @class wxPoserNSButton +// @class wxNSButtonTarget // ============================================================================ -@interface wxPoserNSButton : NSButton +@interface wxNSButtonTarget : NSObject { } - (void)wxNSButtonAction: (id)sender; -@end // wxPoserNSButton - -WX_IMPLEMENT_POSER(wxPoserNSButton); +@end // wxNSButtonTarget -@implementation wxPoserNSButton : NSButton +@implementation wxNSButtonTarget : NSObject - (void)wxNSButtonAction: (id)sender { - wxASSERT_MSG((id)self==sender,wxT("Received wxNSButtonAction from another object")); - wxCocoaNSButton *button = wxCocoaNSButton::GetFromCocoa(self); + wxCocoaNSButton *button = wxCocoaNSButton::GetFromCocoa(sender); wxCHECK_RET(button,wxT("wxNSButtonAction received without associated wx object")); button->Cocoa_wxNSButtonAction(); } -@end // implementation wxPoserNSButton +@end // implementation wxNSButtonTarget + +// ============================================================================ +// class wxCocoaNSButton +// ============================================================================ +const wxObjcAutoRefFromAlloc wxCocoaNSButton::sm_cocoaTarget = [[wxNSButtonTarget alloc] init]; void wxCocoaNSButton::AssociateNSButton(WX_NSButton cocoaNSButton) { if(cocoaNSButton) { sm_cocoaHash.insert(wxCocoaNSButtonHash::value_type(cocoaNSButton,this)); - [cocoaNSButton setTarget: cocoaNSButton]; + [cocoaNSButton setTarget: sm_cocoaTarget]; [cocoaNSButton setAction: @selector(wxNSButtonAction:)]; } }