Allow building with wxUSE_PROTOCOL_FTP/HTTP == 0.

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

diff --git a/include/wx/msw/timer.h b/include/wx/msw/timer.h
index 308257acba781bfb7ff4b350c1470f329b8d15ce..ffa150e111c6a4b4224c4b092bc92aa67679b7b9 100644 (file)
--- a/include/wx/msw/timer.h
+++ b/include/wx/msw/timer.h
@@ -12,7 +12,7 @@
 #ifndef _WX_TIMER_H_
 #define _WX_TIMER_H_
 
 #ifndef _WX_TIMER_H_
 #define _WX_TIMER_H_
 

-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)

     #pragma interface "timer.h"
 #endif
 
     #pragma interface "timer.h"
 #endif
 


@@ -21,19 +21,23 @@ class WXDLLEXPORT wxTimer : public wxTimerBase
 friend void wxProcessTimer(wxTimer& timer);
 
 public:
 friend void wxProcessTimer(wxTimer& timer);
 
 public:

-    wxTimer();
+    wxTimer() { Init(); }
+    wxTimer(wxEvtHandler *owner, int id = wxID_ANY) : wxTimerBase(owner, id)
+        { Init(); }

     ~wxTimer();
 
     ~wxTimer();
 

-    virtual bool Start(int milliseconds = -1, bool oneShot = FALSE);
+    virtual bool Start(int milliseconds = -1, bool oneShot = false);

     virtual void Stop();
 
     virtual bool IsRunning() const { return m_id != 0; }
 
 protected:
     virtual void Stop();
 
     virtual bool IsRunning() const { return m_id != 0; }
 
 protected:

-    long m_id;
+    void Init();
+
+    unsigned long m_id;

 
 private:
 
 private:

-    DECLARE_ABSTRACT_CLASS(wxTimer)
+    DECLARE_DYNAMIC_CLASS_NO_COPY(wxTimer)

 };
 
 #endif
 };
 
 #endif