VC5 didn't support partial specialization either, check for VC>=7

[wxWidgets.git] / include / wx / timer.h

diff --git a/include/wx/timer.h b/include/wx/timer.h
index 346b98deeeca8a47cd5ef2a67edef698c5ceaf54..4e36b6d35f174fc2ea4ddac948d86a19b87a08a7 100644 (file)
--- a/include/wx/timer.h
+++ b/include/wx/timer.h
@@ -32,7 +32,7 @@
 // only send the notification once and then stop the timer
 #define wxTIMER_ONE_SHOT true
 
 // only send the notification once and then stop the timer
 #define wxTIMER_ONE_SHOT true
 

-class WXDLLIMPEXP_BASE wxTimerImpl;
+class WXDLLIMPEXP_FWD_BASE wxTimerImpl;

 
 // the interface of wxTimer class
 class WXDLLIMPEXP_BASE wxTimer : public wxEvtHandler
 
 // the interface of wxTimer class
 class WXDLLIMPEXP_BASE wxTimer : public wxEvtHandler


@@ -116,7 +116,7 @@ protected:
 // wxTimerRunner: starts the timer in its ctor, stops in the dtor
 // ----------------------------------------------------------------------------
 
 // wxTimerRunner: starts the timer in its ctor, stops in the dtor
 // ----------------------------------------------------------------------------
 

-class WXDLLEXPORT wxTimerRunner
+class WXDLLIMPEXP_BASE wxTimerRunner

 {
 public:
     wxTimerRunner(wxTimer& timer) : m_timer(timer) { }
 {
 public:
     wxTimerRunner(wxTimer& timer) : m_timer(timer) { }


@@ -152,23 +152,25 @@ private:
 class WXDLLIMPEXP_BASE wxTimerEvent : public wxEvent
 {
 public:
 class WXDLLIMPEXP_BASE wxTimerEvent : public wxEvent
 {
 public:

-    wxTimerEvent(int timerid = 0, int interval = 0) : wxEvent(timerid)
+    wxTimerEvent(wxTimer& timer)
+        : wxEvent(timer.GetId(), wxEVT_TIMER),
+          m_timer(timer)

     {
     {

-        m_eventType = wxEVT_TIMER;
-
-        m_interval = interval;
+        SetEventObject(timer.GetOwner());

     }
 
     // accessors
     }
 
     // accessors

-    int GetInterval() const { return m_interval; }
+    int GetInterval() const { return m_timer.GetInterval(); }
+    wxTimer& GetTimer() const { return m_timer; }

 
     // implement the base class pure virtual
     virtual wxEvent *Clone() const { return new wxTimerEvent(*this); }
 
 private:
 
     // implement the base class pure virtual
     virtual wxEvent *Clone() const { return new wxTimerEvent(*this); }
 
 private:

-    int m_interval;
+    wxTimer& m_timer;

 
 

-    DECLARE_DYNAMIC_CLASS_NO_ASSIGN(wxTimerEvent)
+    DECLARE_ABSTRACT_CLASS(wxTimerEvent)
+    DECLARE_NO_ASSIGN_CLASS(wxTimerEvent)

 };
 
 typedef void (wxEvtHandler::*wxTimerEventFunction)(wxTimerEvent&);
 };
 
 typedef void (wxEvtHandler::*wxTimerEventFunction)(wxTimerEvent&);