Commit Graph

56 Commits

Author SHA1 Message Date
Vadim Zeitlin
86c6fc77e1 Silently ignore timer events from timers which were just stopped.
An assert in wxTimerWndProc() could be provoked by valid user code which
simply started and stopped the timers quickly enough because a WM_TIMER could
have been already generated just before we stopped the timer.

Simply ignore events from unknown timer under assumption that they must come
from the recently stopped ones instead of asserting.

Ideally we'd somehow distinguish between the situation described above and the
really bogus events which could indicate bugs in wx code or a change in
behaviour in a future version of Windows but there is no easy way to do it so
for now just settle for not asserting in normal case.

Closes #10052.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66228 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-11-22 01:22:47 +00:00
Robin Dunn
b6ae7297d2 Apply new patch fixing problem of IsRunning always returning True. See #11699
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@63486 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-02-15 17:34:21 +00:00
Robin Dunn
1ed7a2064a Allow more than one timer with the same ID. Closes #11699.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@63422 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-02-08 20:06:04 +00:00
Vadim Zeitlin
fe0c328904 Don't pass 0 timer ids to ::SetTimer().
Creating timers with 0 id failed because Windows SetTimer() function requires
a non-zero id. Fix this by using a (impossible at wx API level) -1 id value in
this case instead.

Closes #11392.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@62977 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2009-12-23 13:56:55 +00:00
Vadim Zeitlin
9a83f86094 Globally replace _T() with wxT().
Standardize on using a single macro across all wxWidgets sources and solve the name clash with Sun CC standard headers (see #10660).

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@61508 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2009-07-23 20:30:22 +00:00
Vadim Zeitlin
491acfc75e use WPARAM (which is 64 bit under Win64) for timer ids instead of long (which is still 32 bit) (see #10896)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@61058 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2009-06-15 17:14:50 +00:00
Vadim Zeitlin
7ca19ddbb8 no changes, simply mention a possible misuse of API in a comment (see #60296)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@60745 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2009-05-25 20:48:57 +00:00
Vadim Zeitlin
24a21a5f1d do not overwrite ms_{hwnd,className} in wxTimerHiddenWindowModule::OnInit() in case they were already initialized
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@60669 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2009-05-17 09:58:14 +00:00
Vadim Zeitlin
0e16e5c3b4 add missing wx/module.h header to fix PCH-less build (closes #10743)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@60396 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2009-04-26 19:12:01 +00:00
Robin Dunn
9cfc7f4f68 Use a hidden window to catch the timer messages instead of a timer proc. This fixes an obscure problem where a new activation context is ignored while in the scop of the timer callback. wxPython needs the activation context to always be active.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@60296 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2009-04-24 05:03:42 +00:00
Vadim Zeitlin
c2ca375c56 preparation for allowing to use wxTimer in wxBase (heavily modified patch 1113088):
1. Changed wxTimer to use wxTimerImpl
2. Added Unix-specific generic timer implementation
3. Added wxAppTraits::CreateTimerImpl()


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@45544 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2007-04-20 01:29:16 +00:00
Włodzimierz Skiba
df69528b7e Include wx/hashmap.h according to precompiled headers of wx/wx.h (with other minor cleaning).
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@39802 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-06-20 10:24:07 +00:00
Włodzimierz Skiba
c0badb709a Include wx/timer.h according to precompiled headers of wx/wx.h (with other minor cleaning).
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@39285 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-05-23 11:04:37 +00:00
Włodzimierz Skiba
8ecff18117 Include wx/list.h according to precompiled headers of wx/wx.h (with other minor cleaning).
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38857 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-04-20 07:31:44 +00:00
Julian Smart
3f5c62f982 Reverted semicolons patch
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36973 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-01-18 16:45:41 +00:00
Julian Smart
edef87c827 Applied patch [ 1399013 ] More removals of extraneous semicolons
Wlodek Szafran


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36955 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-01-18 11:46:53 +00:00
Mart Raudsepp
8907154c1a Nuke #pragma implementation/interface's
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35650 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-09-23 12:56:45 +00:00
Julian Smart
106d80ad37 Applied patch [ 1195797 ] Fixes to compile on Win64
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@34241 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-05-22 12:10:55 +00:00
Vadim Zeitlin
ee1025a7e0 ensure that g_timerMap is always initialized before it is used (patch 1060619, bug 1060591)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30473 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-11-11 19:08:15 +00:00
Włodzimierz Skiba
5c519b6cf7 Warning fixes found under hardest mode of OpenWatcom. Seems clean in Borland, MinGW and DMC.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29736 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-08 18:49:13 +00:00
Ryan Norton
3c907f1a7f fix typo
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29307 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-09-24 06:06:09 +00:00
Vadim Zeitlin
6d20f7ae50 fixed signature of wxTimerProc to be conformant to what Windows expects it to be
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29195 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-09-18 11:54:21 +00:00
Julian Smart
655719367a Use old licence name
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@27408 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-05-23 20:53:33 +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
Robin Dunn
313feadc84 Add GetOwner accessor and fix wxRTTI inheritance for wxTimer. Set the
timer as the event object in wxTimerEvents.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@27196 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-05-10 20:53:25 +00:00
Robin Dunn
487f2d58e9 Add some WXDLLIMPEXP's
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24079 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-10-04 03:00:46 +00:00
Vadim Zeitlin
97f278b453 finally reverted patch 782947 completely, it is broken; added just a check that id returned by SetTimer() is not a dup instead
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23885 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-09-24 14:48:33 +00:00
Vadim Zeitlin
5b6c8794de attempt to fix timers when creating them with a valid HWND
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23884 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-09-24 13:46:34 +00:00
Vadim Zeitlin
caa36aab84 undid accidental change to assert in Start() during last commit
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23877 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-09-24 01:54:39 +00:00
Vadim Zeitlin
eccd199223 refactored code to create hidden window in one place only; use it from wxTimer; unregister class used by wxExecute (modified patch 782947)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23868 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-09-23 23:57:32 +00:00
Vadim Zeitlin
5da0803c15 renamed wxWindow::Clear() to ClearBackground() (fixes bug 783576)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22797 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-13 14:09:45 +00:00
Václav Slavík
14f355c2b5 added support for gcc precompiled headers
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22723 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-09 12:46:53 +00:00
Julian Smart
09785dd38d Fixed menubar on WinCE
Removed some obsolete files


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21921 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-12 15:11:00 +00:00
Julian Smart
4676948b68 More WinCE mods
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21902 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-11 21:50:07 +00:00
Vadim Zeitlin
dcc970aff8 compilation fix
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21884 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-10 22:52:43 +00:00
Mattia Barbon
222ed1d678 STL-ification patch for wxMSW and wxGTK.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21876 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-10 19:55:12 +00:00
Julian Smart
6c9a19aaba Removed erroneous copyright names and corrected licence spelling
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19593 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-03-17 11:23:28 +00:00
Ron Lee
04cd30dea2 Update wxList operators, TRUE, FALSE.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18920 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-01-25 04:52:21 +00:00
Vadim Zeitlin
62f17a1864 fixed bug with using wrong interval (-1) when restarting a running timer
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@15536 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-05-12 22:46:12 +00:00
Julian Smart
04ef50df3a First pass at adding MicroWindows support
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10717 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-06-29 10:58:59 +00:00
Vadim Zeitlin
1e6feb95a7 first pass of wxUniv merge - nothing works, most parts don't even compile
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10673 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-06-26 20:59:19 +00:00
Vadim Zeitlin
ed79198695 1. wxTimer change - now generates EVT_TIMER()
2. wxStatusBar reorganisation


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@5848 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2000-02-05 01:57:38 +00:00
Václav Slavík
ad81651f00 removed USE_SHARED_LIBRARY(IES)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@4950 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
1999-12-14 23:57:30 +00:00
Vadim Zeitlin
0470b1e6fe wxTimer/timercmn.cpp change
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@4528 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
1999-11-12 19:19:38 +00:00
Karsten Ballüder
223d09f6b5 replaced T() makro with wxT() due to namespace probs, _T() exists, too
fixed compilation problems, mainly in html code
compiles and links fine on Solaris, runs with samples and Mahogany


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@3894 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
1999-10-08 14:35:56 +00:00
Vadim Zeitlin
73974df1f9 MSW compilation (and other) fixes
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@3829 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
1999-10-04 22:55:10 +00:00
Vadim Zeitlin
e90c1d2a19 many changes; major ones:
1. start of !wxUSE_GUI support
2. _T() macro renamed to T()
3. wxConvertWX2MB and MB2WX macro added


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@3828 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
1999-10-04 20:15:38 +00:00
Ove Kaaven
837e57436a A few weeks of Unicode fixes (my old win95 laptop compiles sloowly,
especially when through the nullmodem cable).


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@2784 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
1999-06-14 14:39:11 +00:00
Brian Macy
0c589ad076 Attempt at getting mingw32 working again... still doesn't work
I wonder when the last time it did work


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@2674 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
1999-06-05 05:00:23 +00:00
Julian Smart
2432b92dd7 Doc & Symantec C++ fixes
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@1325 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
1999-01-07 08:43:47 +00:00