diff options
| author | Michael R Sweet <michael.r.sweet@gmail.com> | 1999-05-07 16:17:49 +0000 |
|---|---|---|
| committer | Michael R Sweet <michael.r.sweet@gmail.com> | 1999-05-07 16:17:49 +0000 |
| commit | 7f48da7bfd6c9ac30f5d37974e95fad82daa9357 (patch) | |
| tree | 966c9a9d12a0bbec3e834afcd15166dbb1897824 | |
| parent | 7becff3f2c7f5e5037a99b8cfe944eaaa2c7fd13 (diff) | |
Fixed bug in WIN32 fl_elapsed() function - didn't initialize
prevclock to valid value [now use GetClockTicks()], and
didn't check for newclock < prevclock (which would be
the case if no messages have been processed yet).
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.0@580 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
| -rw-r--r-- | src/Fl.cxx | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/src/Fl.cxx b/src/Fl.cxx index 22935aab2..c0e3086d5 100644 --- a/src/Fl.cxx +++ b/src/Fl.cxx @@ -1,5 +1,5 @@ // -// "$Id: Fl.cxx,v 1.24.2.6 1999/05/06 06:20:46 bill Exp $" +// "$Id: Fl.cxx,v 1.24.2.7 1999/05/07 16:17:49 mike Exp $" // // Main event handling code for the Fast Light Tool Kit (FLTK). // @@ -164,7 +164,9 @@ static double fl_elapsed() { unsigned long newclock = fl_msg.time; // NOT YET IMPLEMENTED! const int TICKS_PER_SECOND = 1000; // divisor of the value to get seconds static unsigned long prevclock; - if (!initclock) {prevclock = newclock; initclock = 1; return 0.0;} + if (!initclock) {prevclock = newclock = GetTickCount(); initclock = 1; return 0.0;} + else if (newclock < prevclock) return 0.0; + double t = double(newclock-prevclock)/TICKS_PER_SECOND; prevclock = newclock; @@ -696,5 +698,5 @@ int fl_old_shortcut(const char* s) { } // -// End of "$Id: Fl.cxx,v 1.24.2.6 1999/05/06 06:20:46 bill Exp $". +// End of "$Id: Fl.cxx,v 1.24.2.7 1999/05/07 16:17:49 mike Exp $". // |