No real changes, just replace -1 with wxNOT_FOUND in wxBookCtrl code.

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

diff --git a/src/cocoa/NSButton.mm b/src/cocoa/NSButton.mm
index 11027892aa451d5a880cffb52678eeca7f613d82..dee81818a111c5ade028e5f529364ea948178262 100644 (file)
--- 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:     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>
 
@@ -31,32 +32,39 @@
 WX_IMPLEMENT_OBJC_INTERFACE_HASHMAP(NSButton)
 
 // ============================================================================
-// @class wxPoserNSButton
+// @class wxNSButtonTarget
 // ============================================================================
-@interface wxPoserNSButton : NSButton
+@interface wxNSButtonTarget : NSObject
 {
 }
 
 - (void)wxNSButtonAction: (id)sender;
-@end // wxPoserNSButton
+@end // wxNSButtonTarget
+WX_DECLARE_GET_OBJC_CLASS(wxNSButtonTarget,NSObject)
 
-WX_IMPLEMENT_POSER(wxPoserNSButton);
-
-@implementation wxPoserNSButton :  NSButton
+@implementation wxNSButtonTarget :  NSObject
 - (void)wxNSButtonAction: (id)sender
 {
-    wxASSERT_MSG(self==sender,"Received wxNSButtonAction from another object");
-    wxCocoaNSButton *button = wxCocoaNSButton::GetFromCocoa(self);
-    wxCHECK_RET(button,"wxNSButtonAction received without associated wx object");
+    wxCocoaNSButton *button = wxCocoaNSButton::GetFromCocoa(sender);
+    wxCHECK_RET(button,wxT("wxNSButtonAction received without associated wx object"));
     button->Cocoa_wxNSButtonAction();
 }
 
-@end // implementation wxPoserNSButton
+@end // implementation wxNSButtonTarget
+WX_IMPLEMENT_GET_OBJC_CLASS(wxNSButtonTarget,NSObject)
+
+// ============================================================================
+// class wxCocoaNSButton
+// ============================================================================
+const wxObjcAutoRefFromAlloc<struct objc_object*> wxCocoaNSButton::sm_cocoaTarget = [[WX_GET_OBJC_CLASS(wxNSButtonTarget) alloc] init];
 
 void wxCocoaNSButton::AssociateNSButton(WX_NSButton cocoaNSButton)
 {
-    sm_cocoaHash.insert(wxCocoaNSButtonHash::value_type(cocoaNSButton,this));
-    [cocoaNSButton setTarget: cocoaNSButton];
-    [cocoaNSButton setAction: @selector(wxNSButtonAction:)];
+    if(cocoaNSButton)
+    {
+        sm_cocoaHash.insert(wxCocoaNSButtonHash::value_type(cocoaNSButton,this));
+        [cocoaNSButton setTarget: sm_cocoaTarget];
+        [cocoaNSButton setAction: @selector(wxNSButtonAction:)];
+    }
 }