readability cleanup

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

diff --git a/src/cocoa/timer.mm b/src/cocoa/timer.mm
index ad99c3227a9c31936ab2058b12244d9ce238692f..2dfe2cb30a778bb79380b3e8df3455f0f2c1a167 100644 (file)
--- a/src/cocoa/timer.mm
+++ b/src/cocoa/timer.mm
@@ -2,7 +2,7 @@
 // Name:        src/cocoa/timer.mm
 // Purpose:     wxTimer for wxCocoa
 // Author:      Ryan Norton
 // Name:        src/cocoa/timer.mm
 // Purpose:     wxTimer for wxCocoa
 // Author:      Ryan Norton

-// Modified by:
+// Modified by: David Elliott

 // Created:     2005-02-04
 // RCS-ID:      $Id$
 // Copyright:   (c) Ryan Norton
 // Created:     2005-02-04
 // RCS-ID:      $Id$
 // Copyright:   (c) Ryan Norton


@@ -26,6 +26,8 @@
     #include "wx/timer.h"
 #endif
 
     #include "wx/timer.h"
 #endif
 

+#include "wx/cocoa/autorelease.h"
+

 #import <Foundation/NSTimer.h>
 
 // ============================================================================
 #import <Foundation/NSTimer.h>
 
 // ============================================================================


@@ -34,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
 // ========================================================================


@@ -52,27 +44,37 @@ IMPLEMENT_CLASS(wxTimer, wxTimerBase)
     wxTimer* m_timer;
 }
 
     wxTimer* m_timer;
 }
 

-- (id)setTimer:(wxTimer*)theTimer;
+- (id)init;
+- (id)initWithWxTimer:(wxTimer*)theTimer;

 - (wxTimer*)timer;
 - (wxTimer*)timer;

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

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

-- (id)setTimer:(wxTimer*)theTimer;
+- (id)init

 {
 {

+    if(!(self = [super init]))
+        return nil;
+    m_timer = NULL;
+    return self;
+}
+
+- (id)initWithWxTimer:(wxTimer*)theTimer;
+{
+    if(!(self = [super init]))
+        return nil;

     m_timer = theTimer;
     return self;
 }
     m_timer = theTimer;
     return self;
 }

+

 - (wxTimer*)timer
 {
     return m_timer;
 }
 - (wxTimer*)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 
 


@@ -80,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();


@@ -94,12 +94,18 @@ void wxTimer::Init()
 
 bool wxTimer::Start(int millisecs, bool oneShot)
 {
 
 bool wxTimer::Start(int millisecs, bool oneShot)
 {

+    Stop();
+    
+    wxAutoNSAutoreleasePool thePool;
+
+    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:  [[wxNSTimerData alloc] setTimer:this]
+            userInfo:  nil

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

+    [timerData release];

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


@@ -108,9 +114,10 @@ void wxTimer::Stop()
 {
     if (m_cocoaNSTimer)
     {
 {
     if (m_cocoaNSTimer)
     {

+        // FIXME: Is this safe to do if !isValid ?

         [m_cocoaNSTimer invalidate];
         [m_cocoaNSTimer invalidate];

-        [[m_cocoaNSTimer userInfo] release];

         [m_cocoaNSTimer release];
         [m_cocoaNSTimer release];

+        m_cocoaNSTimer = NULL;

     }
 }
 
     }
 }