many compilation fixes for WinCE using VC8 (it now build, although still doesn't...

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

diff --git a/src/cocoa/NSControl.mm b/src/cocoa/NSControl.mm
index 53d42d16971c7c76e05886117240e5c05f620c74..1e6a632de7e3d393085bae7a899237392e3ea2f6 100644 (file)
--- a/src/cocoa/NSControl.mm
+++ b/src/cocoa/NSControl.mm
@@ -6,7 +6,7 @@
 // Created:     2003/02/15
 // RCS-ID:      $Id: 
 // Copyright:   (c) 2003 David Elliott
 // Created:     2003/02/15
 // RCS-ID:      $Id: 
 // Copyright:   (c) 2003 David Elliott

-// Licence:     wxWindows license
+// Licence:     wxWidgets licence

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


@@ -22,6 +22,7 @@
     #include "wx/log.h"
 #endif // WX_PRECOMP
 
     #include "wx/log.h"
 #endif // WX_PRECOMP
 

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

 #include "wx/cocoa/NSControl.h"
 
 #import <Foundation/NSObject.h>
 #include "wx/cocoa/NSControl.h"
 
 #import <Foundation/NSObject.h>


@@ -35,23 +36,25 @@
 
 - (void)wxNSControlAction: (id)sender;
 @end //interface wxNSControlTarget
 
 - (void)wxNSControlAction: (id)sender;
 @end //interface wxNSControlTarget

+WX_DECLARE_GET_OBJC_CLASS(wxNSControlTarget,NSObject)

 
 @implementation wxNSControlTarget : NSObject
 
 - (void)wxNSControlAction: (id)sender
 {
 
 @implementation wxNSControlTarget : NSObject
 
 - (void)wxNSControlAction: (id)sender
 {

-    wxLogDebug("wxNSControlAction");
+    wxLogTrace(wxTRACE_COCOA,wxT("wxNSControlAction"));

     wxCocoaNSControl *wxcontrol = wxCocoaNSControl::GetFromCocoa(sender);
     wxCocoaNSControl *wxcontrol = wxCocoaNSControl::GetFromCocoa(sender);

-    wxCHECK_RET(wxcontrol,"wxNSControlAction received but no wxCocoaNSControl exists!");
+    wxCHECK_RET(wxcontrol,wxT("wxNSControlAction received but no wxCocoaNSControl exists!"));

     wxcontrol->CocoaTarget_action();
 }
 
 @end //implementation wxNSControlTarget
     wxcontrol->CocoaTarget_action();
 }
 
 @end //implementation wxNSControlTarget

+WX_IMPLEMENT_GET_OBJC_CLASS(wxNSControlTarget,NSObject)

 
 // ============================================================================
 // wxNSControl
 // ============================================================================
 WX_IMPLEMENT_OBJC_INTERFACE(NSControl)
 
 
 // ============================================================================
 // wxNSControl
 // ============================================================================
 WX_IMPLEMENT_OBJC_INTERFACE(NSControl)
 

-struct objc_object *wxCocoaNSControl::sm_cocoaTarget = [[wxNSControlTarget alloc] init];
+struct objc_object *wxCocoaNSControl::sm_cocoaTarget = [[WX_GET_OBJC_CLASS(wxNSControlTarget) alloc] init];