Fix compilation with MinGW -std=c++11 option.

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

diff --git a/src/cocoa/NSControl.mm b/src/cocoa/NSControl.mm
index 2f601e3b6b5e228b01569afc6a57cbea0b9b1b3a..0bcac4f44b091fb1a349ad7d1f1772238a2c1c4c 100644 (file)
--- a/src/cocoa/NSControl.mm
+++ b/src/cocoa/NSControl.mm
@@ -1,12 +1,12 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        cocoa/NSControl.cpp
+// Name:        src/cocoa/NSControl.mm

 // Purpose:     wxCocoaNSControl
 // Author:      David Elliott
 // Modified by:
 // Created:     2003/02/15
 // Purpose:     wxCocoaNSControl
 // Author:      David Elliott
 // Modified by:
 // Created:     2003/02/15

-// RCS-ID:      $Id: 
+// RCS-ID:      $Id$

 // Copyright:   (c) 2003 David Elliott
 // Copyright:   (c) 2003 David Elliott

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

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


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

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

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


@@ -35,23 +37,28 @@
 
 - (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(wxT("wxNSControlAction"));
+    wxLogTrace(wxTRACE_COCOA,wxT("wxNSControlAction"));

     wxCocoaNSControl *wxcontrol = wxCocoaNSControl::GetFromCocoa(sender);
     wxCHECK_RET(wxcontrol,wxT("wxNSControlAction received but no wxCocoaNSControl exists!"));
     wxcontrol->CocoaTarget_action();
 }
 
 @end //implementation wxNSControlTarget
     wxCocoaNSControl *wxcontrol = wxCocoaNSControl::GetFromCocoa(sender);
     wxCHECK_RET(wxcontrol,wxT("wxNSControlAction received but no wxCocoaNSControl exists!"));
     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];
+// New CF-retained observer (this should have been using wxObjcAutoRefFromAlloc to begin with)
+wxObjcAutoRefFromAlloc<wxNSControlTarget*> s_cocoaNSControlTarget = [[WX_GET_OBJC_CLASS(wxNSControlTarget) alloc] init];
+// For compatibility with old code
+struct objc_object *wxCocoaNSControl::sm_cocoaTarget = s_cocoaNSControlTarget;