OutputDebugStringW95 removed - it's really unnecessary - and the references to

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

diff --git a/include/wx/timer.h b/include/wx/timer.h
index 609cc33ace3daff794af8353eb35bf305a50e41e..1dbea0030e73c5798cae26d7f94df2802ee8875d 100644 (file)
--- a/include/wx/timer.h
+++ b/include/wx/timer.h
@@ -1,13 +1,52 @@
-#ifndef __TIMERH_BASE__
-#define __TIMERH_BASE__
+#ifndef _WX_TIMER_H_BASE_
+#define _WX_TIMER_H_BASE_

 
 #if defined(__WXMSW__)
 #include "wx/msw/timer.h"
 #elif defined(__WXMOTIF__)
 
 #if defined(__WXMSW__)
 #include "wx/msw/timer.h"
 #elif defined(__WXMOTIF__)

-#include "wx/xt/timer.h"
+#include "wx/motif/timer.h"

 #elif defined(__WXGTK__)
 #include "wx/gtk/timer.h"
 #elif defined(__WXGTK__)
 #include "wx/gtk/timer.h"

+#elif defined(__WXQT__)
+#include "wx/qt/timer.h"
+#elif defined(__WXMAC__)
+#include "wx/mac/timer.h"
+#elif defined(__WXPM__)
+#include "wx/os2/timer.h"
+#elif defined(__WXSTUBS__)
+#include "wx/stubs/timer.h"

 #endif
 
 #endif
 

+class WXDLLEXPORT wxChrono
+{
+public: 
+  wxChrono();
+  
+  void Start(long t=0);
+  void Pause();
+  void Resume();
+
+  long Time();
+
+private:
+  long m_t0;
+  long m_pause;
+};
+
+// Timer functions (milliseconds)
+void WXDLLEXPORT wxStartTimer();
+
+// Gets time since last wxStartTimer or wxGetElapsedTime
+long WXDLLEXPORT wxGetElapsedTime(bool resetTimer = TRUE);
+
+// EXPERIMENTAL: comment this out if it doesn't compile.
+bool WXDLLEXPORT wxGetLocalTime(long *timeZone, int *dstObserved);
+
+// Get number of seconds since 00:00:00 GMT, Jan 1st 1970.
+long WXDLLEXPORT wxGetCurrentTime();
+
+// Get number of milliseconds since 00:00:00 GMT, Jan 1st 1970.
+long WXDLLEXPORT wxGetCurrentMTime();
+

 #endif
 #endif

-    // __TIMERH_BASE__
+    // _WX_TIMER_H_BASE_