Corrected wxRTTI for wxNotebook so dynamic casting to wxBookCtrlBase works

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

diff --git a/src/cocoa/timer.mm b/src/cocoa/timer.mm
index ebcae184308dc94a9e90219c814a7e2d7bf067d6..259011013d42c824054885201fb32717196f3cf1 100644 (file)
--- a/src/cocoa/timer.mm
+++ b/src/cocoa/timer.mm
@@ -25,6 +25,8 @@
 #include "wx/cocoa/private/timer.h"
 #include "wx/cocoa/autorelease.h"
 
 #include "wx/cocoa/private/timer.h"
 #include "wx/cocoa/autorelease.h"
 

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

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


@@ -40,6 +42,7 @@
 - (wxCocoaTimerImpl*)timer;
 - (void)onNotify:(NSTimer *)theTimer;
 @end // interface wxNSTimerData : NSObject
 - (wxCocoaTimerImpl*)timer;
 - (void)onNotify:(NSTimer *)theTimer;
 @end // interface wxNSTimerData : NSObject

+WX_DECLARE_GET_OBJC_CLASS(wxNSTimerData,NSObject)

 
 @implementation wxNSTimerData : NSObject
 - (id)init
 
 @implementation wxNSTimerData : NSObject
 - (id)init


@@ -68,6 +71,7 @@
     m_timer->Notify();
 }
 @end
     m_timer->Notify();
 }
 @end

+WX_IMPLEMENT_GET_OBJC_CLASS(wxNSTimerData,NSObject)

 
 // ----------------------------------------------------------------------------
 // wxCocoaTimerImpl
 
 // ----------------------------------------------------------------------------
 // wxCocoaTimerImpl


@@ -89,7 +93,7 @@ bool wxCocoaTimerImpl::Start(int millisecs, bool oneShot)
 
     wxAutoNSAutoreleasePool thePool;
 
 
     wxAutoNSAutoreleasePool thePool;
 

-    wxNSTimerData *timerData = [[wxNSTimerData alloc] initWithWxTimer:this];
+    wxNSTimerData *timerData = [[WX_GET_OBJC_CLASS(wxNSTimerData) alloc] initWithWxTimer:this];

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