From 4b341bc95abca4f3827c249ade7fee1abba8b5d0 Mon Sep 17 00:00:00 2001 From: Michael R Sweet Date: Mon, 24 May 1999 14:03:47 +0000 Subject: Added Rick's hack for initializing fl_display. fl_call_main() and WinMain are now only compiled in for non-GNU compilers under WIN32 (not needed for Cygwin and friends). git-svn-id: file:///fltk/svn/fltk/branches/branch-1.0@593 ea41ed52-d2ee-0310-a9c1-e6b18d33e121 --- src/Fl.cxx | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'src/Fl.cxx') diff --git a/src/Fl.cxx b/src/Fl.cxx index c0e3086d5..bc2eba49d 100644 --- a/src/Fl.cxx +++ b/src/Fl.cxx @@ -1,5 +1,5 @@ // -// "$Id: Fl.cxx,v 1.24.2.7 1999/05/07 16:17:49 mike Exp $" +// "$Id: Fl.cxx,v 1.24.2.8 1999/05/24 14:03:45 mike Exp $" // // Main event handling code for the Fast Light Tool Kit (FLTK). // @@ -161,10 +161,10 @@ static double fl_elapsed() { #ifdef WIN32 - unsigned long newclock = fl_msg.time; // NOT YET IMPLEMENTED! + unsigned long newclock = GetTickCount(); const int TICKS_PER_SECOND = 1000; // divisor of the value to get seconds static unsigned long prevclock; - if (!initclock) {prevclock = newclock = GetTickCount(); initclock = 1; return 0.0;} + if (!initclock) {prevclock = newclock; initclock = 1; return 0.0;} else if (newclock < prevclock) return 0.0; double t = double(newclock-prevclock)/TICKS_PER_SECOND; @@ -698,5 +698,5 @@ int fl_old_shortcut(const char* s) { } // -// End of "$Id: Fl.cxx,v 1.24.2.7 1999/05/07 16:17:49 mike Exp $". +// End of "$Id: Fl.cxx,v 1.24.2.8 1999/05/24 14:03:45 mike Exp $". // -- cgit v1.2.3