Commit Graph

38 Commits

Author SHA1 Message Date
Vadim Zeitlin
e6cb2e4f8d Remove checks for QueryPerformanceCounter() success.
According to http://msdn.microsoft.com/en-us/library/windows/desktop/dn553408.aspx
this function will never fail under Windows XP or later, so simplify code by
not checking whether it did.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@77472 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2014-08-24 15:31:58 +00:00
Vadim Zeitlin
e393f96dcc Fix static initialization order problem in wxStopWatch under MSW.
Don't rely on the static global gs_perfCounter being already initialized when
wxStopWatch::DoStart() is called, this may not be the case if wxStopWatch
variable is global.

Work around this by wrapping the variable inside a function to ensure that it
is initialized before being used.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@76986 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2014-08-03 12:47:30 +00:00
Vadim Zeitlin
b905bae91c Fix harmless warnings about unused global variables.
Don't define variables that we never use to fix clang warnings about them.

See #15915.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@75986 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2014-02-22 22:39:48 +00:00
Vadim Zeitlin
3f66f6a5b3 Remove all lines containing cvs/svn "$Id$" keyword.
This keyword is not expanded by Git which means it's not replaced with the
correct revision value in the releases made using git-based scripts and it's
confusing to have lines with unexpanded "$Id$" in the released files. As
expanding them with Git is not that simple (it could be done with git archive
and export-subst attribute) and there are not many benefits in having them in
the first place, just remove all these lines.

If nothing else, this will make an eventual transition to Git simpler.

Closes #14487.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@74602 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2013-07-26 16:02:46 +00:00
Vadim Zeitlin
d98a58c543 Use __WINDOWS__ for OS kind checks and reserve __WXMSW__ for GUI toolkit.
This change prepares the way for using wxGTK under Windows as this would
still define __WINDOWS__ but use __WXGTK__ instead of __WXMSW__.

Closes #14064.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70796 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-03-04 00:29:31 +00:00
Vadim Zeitlin
0c717dd16b Compilation fix for wxStopWatch with wxUSE_THREADS==0.
Use wxCRIT_SECT_DECLARE_MEMBER/wxCRIT_SECT_LOCKER macros which expand to
nothing in wxUSE_THREADS==0 case instead of using wxCriticalSection[Locker]
classes which are not defined then.

Also explicitly include wx/thread.h.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70012 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-12-15 21:13:03 +00:00
Vadim Zeitlin
17d72a48ff Fix bug with wxStopWatch::Start() not resuming paused stopwatch any more.
Since r69835 the stop watch remained paused even when Start() was called. Do
resume it when restarting it both for backwards compatibility and because it
makes more sense and also document this behaviour.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69921 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-12-03 00:34:00 +00:00
Vadim Zeitlin
796e54ef37 Use wxGetUTCTimeUSec() in wxStopWatch under Unix for higher precision.
If gettimeofday() is available we can achieve better than millisecond
precision (even if it usually isn't as high as microsecond), so use it as
clock source in wxStopWatch.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69841 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-11-27 19:50:42 +00:00
Vadim Zeitlin
e16458826d Use wxGetUTCTimeMillis() instead of wxGetLocalTimeMillis() in wxStopWatch.
Using local time meant that wxStopWatch didn't work reliably around DST
changes. It also was completely unnecessary, just use the UTC clock instead.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69840 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-11-27 19:50:35 +00:00
Vadim Zeitlin
173a5ddc77 No changes, just move time functions from wx/stopwatch.h to wx/time.h.
Preserve compatibility by including wx/time.h from wx/stopwatch.h but put all
the time-related functions in a more logical place.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69838 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-11-27 19:50:27 +00:00
Vadim Zeitlin
a43503cb8d Added wxGetUTCTimeMillis() and wxGetUTCTimeUSec().
Fixed wxGetLocalTimeMillis() to really return the local time and provide
wxGetUTCTimeMillis() doing what this function used to do before. Closes #13610.

Also add wxGetUTCTimeUSec() for even higher resolution time stamps as it is
basically the same as wxGetUTCTimeMillis() anyhow, at least for MSW and
non-ancient Unix systems providing gettimeofday().

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69837 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-11-27 19:50:23 +00:00
Vadim Zeitlin
b0ec002323 Added wxStopWatch::TimeInMicro() for better precision time measurement.
Also simplify/streamline wxStopWatch implementation and replace confusingly
named m_pause with more clear m_elapsedBeforePause.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69835 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-11-27 19:50:12 +00:00
Vadim Zeitlin
54647bb750 Use ::QueryPerformanceCounter() for wxStopWatch implementation in wxMSW.
QueryPerformanceCounter() provides higher resolution and precision for
measuring time under MSW, even though it suffers from some problems in older
Windows versions.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69834 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-11-27 19:50:08 +00:00
Vadim Zeitlin
526954c596 Globally use "wxWindows licence" consistently.
Use "wxWindows licence" and not "wxWidgets licence" (the latter doesn't
exist) and consistently spell "licence" using British spelling.

See #12165.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@64940 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-07-13 13:29:13 +00:00
Stefan Csomor
35c9a66079 removing unneeded code for osx
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@54031 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2008-06-08 16:56:17 +00:00
Vadim Zeitlin
9b4da62701 PalmOS compilation fixes (wx-trunk-out.diff part of patch 1894861)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@52226 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2008-03-02 00:43:06 +00:00
Vadim Zeitlin
39affc0451 made wxGetTimeOfDay() public
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@44684 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2007-03-08 01:44:16 +00:00
Włodzimierz Skiba
57bd4c6031 Include wx/msw/wrap*.h according to pch support (with other minor cleaning).
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@41054 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-09-07 19:01:45 +00:00
Włodzimierz Skiba
bb90a3e6fd Include wx/stopwatch.h according to precompiled headers of wx/wx.h (with other minor cleaning).
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@40313 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-07-25 08:47:47 +00:00
Vadim Zeitlin
608f8a111b provide wxGetLocalTimeMillis() (returning double) even if wxUSE_LONGLONG==0
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37495 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-02-11 16:38:28 +00:00
Stefan Csomor
768c6e8be2 OSX two-level header fixes
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@34924 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-07-24 13:36:31 +00:00
Włodzimierz Skiba
20bc5ad8dd Global platform header (<PalmOS.h>) removed from public wx-headers (but included in wxprec.h) with all consequences in wxPalmOS specific API.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@34795 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-07-01 19:36:58 +00:00
Włodzimierz Skiba
29468083f4 Fix for using std streams when std:: conflicts with ::
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@33556 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-04-12 21:08:04 +00:00
Włodzimierz Skiba
6058220154 Native PalmOS wxLongLong. Introduction of wxULongLong_t due to 'unsigned' not working on internally typedefed wxLongLong_t (both unsigned wxLongLong_t and wxULongLong_t should work for other platforms). Improvements in wxDatePicker control on PalmOS.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@32092 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-02-16 09:35:31 +00:00
Robert Roebling
85445d3445 Typo.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@32084 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-02-15 19:55:39 +00:00
Robert Roebling
2555c77a81 Committed currently disabled code that implements
the wxStopWatch based on QueryPerformanceCounter()
   I'll do more testing if I can, but here is the code
   for other to look at.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@32083 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-02-15 19:50:27 +00:00
Włodzimierz Skiba
d775fa8235 Source cleaning: whitespaces, tabs, -1/wxID_ANY/wxNOT_FOUND/wxDefaultCoord, TRUE/true, FALSE/false.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29257 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-09-22 14:38:52 +00:00
Julian Smart
0a53b9b8fe Missed reversions
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@27433 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-05-25 17:31:17 +00:00
Julian Smart
77ffb5937e Name and version changes
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@27404 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-05-23 14:56:36 +00:00
Vadim Zeitlin
940b4f0741 time() takes time_t, not [unsigned] long -- and in fact we don't need to pass it any argument at all
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@26897 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-04-21 12:49:52 +00:00
Julian Smart
d1faf43f89 Temporary fix for VC++ compile breakage.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@26888 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-04-20 22:12:06 +00:00
Robert Roebling
4056c8fe0c Applied the two patches from Kevin for gsocket
and wxGetTUCTime.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@26882 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-04-20 18:54:39 +00:00
Julian Smart
cd2a4e161d Applied patch [ 856318 ] A few Wine fixes
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24761 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-12-11 11:06:56 +00:00
Václav Slavík
d5b12ad9a7 wxBase compilation fixes
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22881 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-14 18:20:51 +00:00
Václav Slavík
9ed0d735d5 added <windows.h> wrapper
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22004 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-15 18:52:32 +00:00
Julian Smart
1c193821a9 More WinCE mods.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21890 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-11 11:21:47 +00:00
Václav Slavík
8df6de970d compilation fixes
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21349 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-06-24 11:21:42 +00:00
Vadim Zeitlin
e2478fde62 wxBase/GUI separation: 1st step, wxMSW should build, all the rest is broken
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21342 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-06-24 00:56:19 +00:00