Improved selection mode handling in wxGrid::SelectBlock

[wxWidgets.git] / src / common / timercmn.cpp

diff --git a/src/common/timercmn.cpp b/src/common/timercmn.cpp
index 3d8db4c93692b5d1572985db5ddaeba7ae67425e..f6148e0aa91db1a73a85bfd1ce21ce968a8598e8 100644 (file)
--- a/src/common/timercmn.cpp
+++ b/src/common/timercmn.cpp
@@ -19,7 +19,7 @@
 // ============================================================================
 
 // ----------------------------------------------------------------------------
 // ============================================================================
 
 // ----------------------------------------------------------------------------

-// headers
+// wxWin headers

 // ----------------------------------------------------------------------------
 
 #ifdef __GNUG__
 // ----------------------------------------------------------------------------
 
 #ifdef __GNUG__


@@ -41,10 +41,18 @@
 #include "wx/timer.h"
 #include "wx/longlong.h"
 
 #include "wx/timer.h"
 #include "wx/longlong.h"
 

+// ----------------------------------------------------------------------------
+// System headers
+// ----------------------------------------------------------------------------
+

 #if defined(__WIN32__)
     #include <windows.h>
 #endif
 
 #if defined(__WIN32__)
     #include <windows.h>
 #endif
 

+#if defined(__WIN32__) && !defined(HAVE_FTIME)
+    #define HAVE_FTIME
+#endif
+

 #include <time.h>
 #ifndef __WXMAC__
     #include <sys/types.h>      // for time_t
 #include <time.h>
 #ifndef __WXMAC__
     #include <sys/types.h>      // for time_t


@@ -61,7 +69,9 @@
 // wxWin macros
 // ----------------------------------------------------------------------------
 
 // wxWin macros
 // ----------------------------------------------------------------------------
 

-IMPLEMENT_DYNAMIC_CLASS(wxTimerEvent, wxEvent)
+#if wxUSE_GUI
+    IMPLEMENT_DYNAMIC_CLASS(wxTimerEvent, wxEvent)
+#endif // wxUSE_GUI

 
 // ----------------------------------------------------------------------------
 // macros
 
 // ----------------------------------------------------------------------------
 // macros


@@ -92,6 +102,8 @@ wxLongLong wxGetLocalTimeMillis();
 // wxTimerBase
 // ----------------------------------------------------------------------------
 
 // wxTimerBase
 // ----------------------------------------------------------------------------
 

+#if wxUSE_GUI
+

 void wxTimerBase::Notify()
 {
     // the base class version generates an event if it has owner - which it
 void wxTimerBase::Notify()
 {
     // the base class version generates an event if it has owner - which it


@@ -102,6 +114,8 @@ void wxTimerBase::Notify()
     (void)m_owner->ProcessEvent(event);
 }
 
     (void)m_owner->ProcessEvent(event);
 }
 

+#endif // wxUSE_GUI
+

 // ----------------------------------------------------------------------------
 // wxStopWatch
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // wxStopWatch
 // ----------------------------------------------------------------------------


@@ -218,11 +232,16 @@ long wxGetUTCTime()
 
             if (t0 != (time_t)-1 )
                 return (long)difftime(t1, t0) + (60 * 60 * 24 * 4);
 
             if (t0 != (time_t)-1 )
                 return (long)difftime(t1, t0) + (60 * 60 * 24 * 4);

-            wxLogSysError(_("Failed 2nd mktime"));
+            wxLogSysError(_("mktime() failed"));
+        }
+        else
+        {
+            wxLogSysError(_("gmtime() failed"));

         }
         }

-        wxLogSysError(_("Failed gmtime"));

     }
     }

-    wxLogSysError(_("Failed to get the UTC system time"));
+
+    wxLogError(_("Failed to get the UTC system time."));
+

     return -1;
 }
 
     return -1;
 }
 


@@ -232,6 +251,9 @@ wxLongLong wxGetLocalTimeMillis()
 {
     wxLongLong val = 1000l;
 
 {
     wxLongLong val = 1000l;
 

+    // If possible, use a functin which avoids conversions from
+    // broken-up time structures to milliseconds,
+

 #if defined(HAVE_GETTIMEOFDAY)
     struct timeval tp;
     if ( wxGetTimeOfDay(&tp, (struct timezone *)NULL) != -1 )
 #if defined(HAVE_GETTIMEOFDAY)
     struct timeval tp;
     if ( wxGetTimeOfDay(&tp, (struct timezone *)NULL) != -1 )


@@ -239,35 +261,46 @@ wxLongLong wxGetLocalTimeMillis()
         val *= tp.tv_sec;
         return (val + (tp.tv_usec / 1000));
     }
         val *= tp.tv_sec;
         return (val + (tp.tv_usec / 1000));
     }

-#else
+    else
+    {
+        wxLogError(_("wxGetTimeOfDay failed."));
+        return 0;
+    }
+#elif defined(HAVE_FTIME)
+    struct timeb tp;

 
 

+    // ftime() is void and not int in some mingw32 headers, so don't
+    // test the return code (well, it shouldn't fail anyhow...)
+    (void)ftime(&tp);
+    val *= tp.time;
+    return (val + tp.millitm);
+#else

     // We use wxGetLocalTime() to get the seconds since
     // 00:00:00 Jan 1st 1970 and then whatever is available
     // to get millisecond resolution.
     // We use wxGetLocalTime() to get the seconds since
     // 00:00:00 Jan 1st 1970 and then whatever is available
     // to get millisecond resolution.

-    // THIS LEADS TO A BUG SINCE REFERENCE TIME ARE DIFFERENT
+    //
+    // NOTE that this might lead to a problem if the clocks
+    // use different sources, so this approach should be
+    // avoided where possible.
+

     val *= wxGetLocalTime();
 
     val *= wxGetLocalTime();
 

-    // If we got here, do not fail even if we can't get
-    // millisecond resolution.
-    //
-#if defined(__WIN32__)
+#if defined(__VISAGECPP__)
+    DATETIME dt;
+    ::DosGetDateTime(&dt);
+    val += (dt.hundredths*10);
+#elif defined (__WIN32__)
+#warning "Possible clock skew bug in wxStopWatch!"

     SYSTEMTIME st;
     ::GetLocalTime(&st);
     SYSTEMTIME st;
     ::GetLocalTime(&st);

-    return (val + st.wMilliseconds);
-#elif defined(__VISAGECPP__)
-    DATETIME    dt;
-    ::DosGetDateTime(&dt);
-    return (val + dt.hundredths*10);
-#elif defined(HAVE_FTIME)
-    struct timeb tp;
-    if ( ftime(&tp) == 0 )
-    {
-        return (val + tp.millitm);
-    }
-#elif !defined(__BORLANDC__) && !(defined(__VISUALC__) && defined(__WIN16__))
-    #warning "wxStopWatch will be up to second resolution!"
+    val += st.wMilliseconds;
+#else
+#ifndef __VISUALC__
+#warning "wxStopWatch will be up to second resolution!"

 #endif
 #endif
 
     return val;
 #endif
 #endif
 
     return val;

+
+#endif

 }
 }