don't pass NULL pointer to printf(), this crashes Solaris printf

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

diff --git a/include/wx/stopwatch.h b/include/wx/stopwatch.h
index 9a014c5cd8d43c8ca61a75e4e89f597bcf31b1d6..19d35a168b679313f93b7a86f32ba17135a6f861 100644 (file)
--- a/include/wx/stopwatch.h
+++ b/include/wx/stopwatch.h
@@ -4,20 +4,23 @@
 // Author:      Julian Smart (wxTimer), Sylvain Bougnoux (wxStopWatch)
 // Created:     26.06.03 (extracted from wx/timer.h)
 // RCS-ID:      $Id$
 // Author:      Julian Smart (wxTimer), Sylvain Bougnoux (wxStopWatch)
 // Created:     26.06.03 (extracted from wx/timer.h)
 // RCS-ID:      $Id$

-// Copyright:   (c) 1998-2003 wxWindows team
+// Copyright:   (c) 1998-2003 Julian Smart, Sylvain Bougnoux

 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_STOPWATCH_H_
 #define _WX_STOPWATCH_H_
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_STOPWATCH_H_
 #define _WX_STOPWATCH_H_

-//
+
+#include "wx/defs.h"
+#include "wx/longlong.h"
+

 // ----------------------------------------------------------------------------
 // wxStopWatch: measure time intervals with up to 1ms resolution
 // ----------------------------------------------------------------------------
 
 #if wxUSE_STOPWATCH
 
 // ----------------------------------------------------------------------------
 // wxStopWatch: measure time intervals with up to 1ms resolution
 // ----------------------------------------------------------------------------
 
 #if wxUSE_STOPWATCH
 

-class WXDLLEXPORT_BASE wxStopWatch
+class WXDLLIMPEXP_BASE wxStopWatch

 {
 public:
     // ctor starts the stop watch
 {
 public:
     // ctor starts the stop watch


@@ -67,11 +70,11 @@ private:
 
 // Starts a global timer
 // -- DEPRECATED: use wxStopWatch instead
 
 // Starts a global timer
 // -- DEPRECATED: use wxStopWatch instead

-void WXDLLEXPORT_BASE wxStartTimer();
+void WXDLLIMPEXP_BASE wxStartTimer();

 
 // Gets elapsed milliseconds since last wxStartTimer or wxGetElapsedTime
 // -- DEPRECATED: use wxStopWatch instead
 
 // Gets elapsed milliseconds since last wxStartTimer or wxGetElapsedTime
 // -- DEPRECATED: use wxStopWatch instead

-long WXDLLEXPORT_BASE wxGetElapsedTime(bool resetTimer = TRUE);
+long WXDLLIMPEXP_BASE wxGetElapsedTime(bool resetTimer = true);

 
 #endif // wxUSE_LONGLONG
 
 
 #endif // wxUSE_LONGLONG
 


@@ -80,14 +83,14 @@ long WXDLLEXPORT_BASE 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.

-extern long WXDLLEXPORT_BASE wxGetLocalTime();
+extern long WXDLLIMPEXP_BASE 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.

-extern long WXDLLEXPORT_BASE wxGetUTCTime();
+extern long WXDLLIMPEXP_BASE wxGetUTCTime();

 
 #if wxUSE_LONGLONG
 // Get number of milliseconds since local time 00:00:00 Jan 1st 1970
 
 #if wxUSE_LONGLONG
 // Get number of milliseconds since local time 00:00:00 Jan 1st 1970

-extern wxLongLong WXDLLEXPORT_BASE wxGetLocalTimeMillis();
+extern wxLongLong WXDLLIMPEXP_BASE wxGetLocalTimeMillis();

 #endif // wxUSE_LONGLONG
 
 #define wxGetCurrentTime() wxGetLocalTime()
 #endif // wxUSE_LONGLONG
 
 #define wxGetCurrentTime() wxGetLocalTime()