Remove sm_cocoaDelegate singleton. We need per-instance data anyway so we

may as well make it the target instead of the userInfo.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35942 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/include/wx/cocoa/timer.h b/include/wx/cocoa/timer.h
index 27aa354e6e39292a526e927808b24063f6b2ad31..626a85635a2bd9248a9a6c4297a1de297349376c 100644 (file)
--- a/include/wx/cocoa/timer.h
+++ b/include/wx/cocoa/timer.h
@@ -40,7 +40,6 @@ protected:
 
 private:
     WX_NSTimer m_cocoaNSTimer;
 
 private:
     WX_NSTimer m_cocoaNSTimer;

-    static const wxObjcAutoRefFromAlloc<struct objc_object *> sm_cocoaDelegate;

 
     DECLARE_ABSTRACT_CLASS(wxTimer)
 };
 
     DECLARE_ABSTRACT_CLASS(wxTimer)
 };

diff --git a/src/cocoa/timer.mm b/src/cocoa/timer.mm
index 8f112e17e748db208c39ff042bb5a9aa981c26e0..2dfe2cb30a778bb79380b3e8df3455f0f2c1a167 100644 (file)
--- a/src/cocoa/timer.mm
+++ b/src/cocoa/timer.mm
@@ -36,16 +36,6 @@
 
 IMPLEMENT_CLASS(wxTimer, wxTimerBase)
 
 
 IMPLEMENT_CLASS(wxTimer, wxTimerBase)
 

-// ========================================================================
-// wxNSTimerDelegate
-// ========================================================================
-@interface wxNSTimerDelegate : NSObject
-{
-}
-
-- (void)onNotify:(NSTimer *)theTimer;
-@end // interface wxNSTimerDelegate : NSObject
-

 // ========================================================================
 // wxNSTimerData
 // ========================================================================
 // ========================================================================
 // wxNSTimerData
 // ========================================================================


@@ -57,6 +47,7 @@ IMPLEMENT_CLASS(wxTimer, wxTimerBase)
 - (id)init;
 - (id)initWithWxTimer:(wxTimer*)theTimer;
 - (wxTimer*)timer;
 - (id)init;
 - (id)initWithWxTimer:(wxTimer*)theTimer;
 - (wxTimer*)timer;

+- (void)onNotify:(NSTimer *)theTimer;

 @end // interface wxNSTimerData : NSObject
 
 @implementation wxNSTimerData : NSObject
 @end // interface wxNSTimerData : NSObject
 
 @implementation wxNSTimerData : NSObject


@@ -80,13 +71,10 @@ IMPLEMENT_CLASS(wxTimer, wxTimerBase)
 {
     return m_timer;
 }
 {
     return m_timer;
 }

-@end 

 
 

-@implementation wxNSTimerDelegate : NSObject

 - (void)onNotify:(NSTimer *)theTimer
 {
 - (void)onNotify:(NSTimer *)theTimer
 {

-    wxNSTimerData* theData = [theTimer userInfo];
-    [theData timer]->Notify(); //wxTimerBase method
+    m_timer->Notify(); //wxTimerBase method

 }
 @end 
 
 }
 @end 
 


@@ -94,8 +82,6 @@ IMPLEMENT_CLASS(wxTimer, wxTimerBase)
 // wxTimer
 // ----------------------------------------------------------------------------
 
 // wxTimer
 // ----------------------------------------------------------------------------
 

-const wxObjcAutoRefFromAlloc<struct objc_object*> wxTimer::sm_cocoaDelegate = [[wxNSTimerDelegate alloc] init];
-

 wxTimer::~wxTimer()
 {
     Stop();
 wxTimer::~wxTimer()
 {
     Stop();


@@ -112,14 +98,14 @@ bool wxTimer::Start(int millisecs, bool oneShot)
     
     wxAutoNSAutoreleasePool thePool;
 
     
     wxAutoNSAutoreleasePool thePool;
 

-    wxNSTimerData *userInfo = [[wxNSTimerData alloc] initWithWxTimer:this];
+    wxNSTimerData *timerData = [[wxNSTimerData alloc] initWithWxTimer:this];

     m_cocoaNSTimer =     [[NSTimer 
             scheduledTimerWithTimeInterval: millisecs / 1000.0 //seconds
     m_cocoaNSTimer =     [[NSTimer 
             scheduledTimerWithTimeInterval: millisecs / 1000.0 //seconds

-            target:            wxTimer::sm_cocoaDelegate
+            target:    timerData

             selector:  @selector(onNotify:) 
             selector:  @selector(onNotify:) 

-            userInfo:  userInfo
+            userInfo:  nil

             repeats:   oneShot == false] retain];
             repeats:   oneShot == false] retain];

-    [userInfo release];
+    [timerData release];

                        
     return IsRunning();
 }
                        
     return IsRunning();
 }