Added From(), OrderBy() and Where() functions that correspons to the Set/GetWhereClau...

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

diff --git a/include/wx/timer.h b/include/wx/timer.h
index eddeb32d2c6e176c66e64553994e654ab61b4664..8c1724df97699b953667afa4f7696ce8af991066 100644 (file)
--- a/include/wx/timer.h
+++ b/include/wx/timer.h
@@ -54,18 +54,10 @@ public:
 
     // start the timer: if milliseconds == -1, use the same value as for the
     // last Start()
 
     // start the timer: if milliseconds == -1, use the same value as for the
     // last Start()

-    virtual bool Start(int milliseconds = -1, bool oneShot = FALSE)
-    {
-        if ( milliseconds != -1 )
-        {
-            m_milli = milliseconds;
-        }
-
-        m_oneShot = oneShot;
-
-        return TRUE;
-    }
-
+    //
+    // it is now valid to call Start() multiple times: this just restarts the
+    // timer if it is already running
+    virtual bool Start(int milliseconds = -1, bool oneShot = FALSE);

 
     // stop the timer
     virtual void Stop() = 0;
 
     // stop the timer
     virtual void Stop() = 0;


@@ -222,10 +214,13 @@ long WXDLLEXPORT wxGetElapsedTime(bool resetTimer = TRUE);
 // ----------------------------------------------------------------------------
 
 // Get number of seconds since local time 00:00:00 Jan 1st 1970.
 // ----------------------------------------------------------------------------
 
 // Get number of seconds since local time 00:00:00 Jan 1st 1970.

-long WXDLLEXPORT wxGetLocalTime();
+extern long WXDLLEXPORT wxGetLocalTime();

 
 // Get number of seconds since GMT 00:00:00, Jan 1st 1970.
 
 // Get number of seconds since GMT 00:00:00, Jan 1st 1970.

-long WXDLLEXPORT wxGetUTCTime();
+extern long WXDLLEXPORT wxGetUTCTime();
+
+// Get number of milliseconds since local time 00:00:00 Jan 1st 1970
+extern wxLongLong WXDLLEXPORT wxGetLocalTimeMillis();

 
 #define wxGetCurrentTime() wxGetLocalTime()
 
 
 #define wxGetCurrentTime() wxGetLocalTime()