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

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

diff --git a/src/cocoa/NSButton.mm b/src/cocoa/NSButton.mm
index e2436fca0a4080113d7048022b212a0b52e698e1..a7bc9d10a2f6d62c6b50a235155a55d1bc30061e 100644 (file)
--- a/src/cocoa/NSButton.mm
+++ b/src/cocoa/NSButton.mm
@@ -1,12 +1,12 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        cocoa/NSButton.cpp
+// Name:        src/cocoa/NSButton.mm
 // Purpose:     wxCocoaNSButton
 // Author:      David Elliott
 // Modified by:
 // Created:     2003/01/31
 // RCS-ID:      $Id$
 // Copyright:   (c) 2003-2004 David Elliott
-// Licence:     wxWidgets licence
+// Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================
@@ -22,6 +22,7 @@
     #include "wx/log.h"
 #endif // WX_PRECOMP
 
+#include "wx/cocoa/objc/objc_uniquifying.h"
 #include "wx/cocoa/NSButton.h"
 #import <AppKit/NSButton.h>
 
@@ -39,6 +40,7 @@ WX_IMPLEMENT_OBJC_INTERFACE_HASHMAP(NSButton)
 
 - (void)wxNSButtonAction: (id)sender;
 @end // wxNSButtonTarget
+WX_DECLARE_GET_OBJC_CLASS(wxNSButtonTarget,NSObject)
 
 @implementation wxNSButtonTarget :  NSObject
 - (void)wxNSButtonAction: (id)sender
@@ -49,11 +51,12 @@ WX_IMPLEMENT_OBJC_INTERFACE_HASHMAP(NSButton)
 }
 
 @end // implementation wxNSButtonTarget
+WX_IMPLEMENT_GET_OBJC_CLASS(wxNSButtonTarget,NSObject)
 
 // ============================================================================
 // class wxCocoaNSButton
 // ============================================================================
-const wxObjcAutoRefFromAlloc<struct objc_object*> wxCocoaNSButton::sm_cocoaTarget = [[wxNSButtonTarget alloc] init];
+const wxObjcAutoRefFromAlloc<struct objc_object*> wxCocoaNSButton::sm_cocoaTarget = [[WX_GET_OBJC_CLASS(wxNSButtonTarget) alloc] init];
 
 void wxCocoaNSButton::AssociateNSButton(WX_NSButton cocoaNSButton)
 {