X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/e668651137922bee36b5773d638aa696e78854d1..600902562da4b1008c006a1d9daca40fc932b7ef:/include/wx/cocoa/NSButton.h diff --git a/include/wx/cocoa/NSButton.h b/include/wx/cocoa/NSButton.h index 7e8f8add03..2a90d41451 100644 --- a/include/wx/cocoa/NSButton.h +++ b/include/wx/cocoa/NSButton.h @@ -4,16 +4,17 @@ // Author: David Elliott // Modified by: // Created: 2002/12/09 -// RCS-ID: $Id: -// Copyright: (c) 2002 David Elliott -// Licence: wxWindows license +// RCS-ID: $Id$ +// Copyright: (c) 2002-2004 David Elliott +// Licence: wxWindows licence /////////////////////////////////////////////////////////////////////////////// -#ifndef __WX_COCOA_NSBUTTON_H__ -#define __WX_COCOA_NSBUTTON_H__ +#ifndef _WX_COCOA_NSBUTTON_H__ +#define _WX_COCOA_NSBUTTON_H__ #include "wx/hashmap.h" #include "wx/cocoa/ObjcAssociate.h" +#include "wx/cocoa/ObjcRef.h" WX_DECLARE_OBJC_HASHMAP(NSButton); @@ -24,11 +25,13 @@ public: void AssociateNSButton(WX_NSButton cocoaNSButton); inline void DisassociateNSButton(WX_NSButton cocoaNSButton) { - sm_cocoaHash.erase(cocoaNSButton); + if(cocoaNSButton) + sm_cocoaHash.erase(cocoaNSButton); } -public: virtual void Cocoa_wxNSButtonAction(void) = 0; +protected: + static const wxObjcAutoRefFromAlloc sm_cocoaTarget; }; -#endif // _WX_COCOA_NSBUTTON_H_ +#endif // _WX_COCOA_NSBUTTON_H__