X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/edef87c8274bd4cadcccc4ff107aeb1815e48460..f5766910b6731eb03e82371416e9778203396ce7:/src/msw/timer.cpp diff --git a/src/msw/timer.cpp b/src/msw/timer.cpp index 1c94d7de49..8fe20ab638 100644 --- a/src/msw/timer.cpp +++ b/src/msw/timer.cpp @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: msw/timer.cpp +// Name: src/msw/timer.cpp // Purpose: wxTimer implementation // Author: Julian Smart // Modified by: Vadim Zeitlin (use hash map instead of list, global rewrite) @@ -18,19 +18,18 @@ #if wxUSE_TIMER +#include "wx/timer.h" + #ifndef WX_PRECOMP - #include "wx/window.h" #include "wx/list.h" + #include "wx/window.h" #include "wx/event.h" #include "wx/app.h" #include "wx/intl.h" #include "wx/log.h" + #include "wx/hashmap.h" #endif -#include "wx/hashmap.h" - -#include "wx/timer.h" - #include "wx/msw/private.h" // ---------------------------------------------------------------------------- @@ -40,7 +39,7 @@ // define a hash containing all the timers: it is indexed by timer id and // contains the corresponding timer WX_DECLARE_HASH_MAP(unsigned long, wxTimer *, wxIntegerHash, wxIntegerEqual, - wxTimerMap) + wxTimerMap); // instead of using a global here, wrap it in a static function as otherwise it // could have been used before being initialized if a timer object were created @@ -162,4 +161,3 @@ wxTimerProc(HWND WXUNUSED(hwnd), } #endif // wxUSE_TIMER -