Move wxCocoa's wxFontRefData from the header to the implementation file.

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

diff --git a/src/cocoa/NSButton.mm b/src/cocoa/NSButton.mm
index 63cf30df2f37dff30e62d253ce07080f0c0b3427..00bace286bc2707d63c44c5e18b04a32a68910bd 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
 // 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,7 @@
     #include "wx/log.h"
 #endif // WX_PRECOMP
 
     #include "wx/log.h"
 #endif // WX_PRECOMP
 

-#include "wx/cocoa/ObjcPose.h"
-
+#include "wx/cocoa/objc/objc_uniquifying.h"

 #include "wx/cocoa/NSButton.h"
 #import <AppKit/NSButton.h>
 
 #include "wx/cocoa/NSButton.h"
 #import <AppKit/NSButton.h>
 


@@ -33,34 +32,38 @@
 WX_IMPLEMENT_OBJC_INTERFACE_HASHMAP(NSButton)
 
 // ============================================================================
 WX_IMPLEMENT_OBJC_INTERFACE_HASHMAP(NSButton)
 
 // ============================================================================

-// @class wxPoserNSButton
+// @class wxNSButtonTarget

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

-@interface wxPoserNSButton : NSButton
+@interface wxNSButtonTarget : NSObject

 {
 }
 
 - (void)wxNSButtonAction: (id)sender;
 {
 }
 
 - (void)wxNSButtonAction: (id)sender;

-@end // wxPoserNSButton
-
-WX_IMPLEMENT_POSER(wxPoserNSButton);
+@end // wxNSButtonTarget
+WX_DECLARE_GET_OBJC_CLASS(wxNSButtonTarget,NSObject)

 
 

-@implementation wxPoserNSButton :  NSButton
+@implementation wxNSButtonTarget :  NSObject

 - (void)wxNSButtonAction: (id)sender
 {
 - (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();
 }
 
     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)
 {
     if(cocoaNSButton)
     {
         sm_cocoaHash.insert(wxCocoaNSButtonHash::value_type(cocoaNSButton,this));
 
 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:)];
     }
 }
         [cocoaNSButton setAction: @selector(wxNSButtonAction:)];
     }
 }