X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/14f355c2b5c71fc7c3d680aea366582d2ac60f7b..cb73e6001f891ae46b12a1e4ca39b93649cb6099:/src/msw/timer.cpp?ds=sidebyside diff --git a/src/msw/timer.cpp b/src/msw/timer.cpp index 64096f7d77..cccb8ed09f 100644 --- a/src/msw/timer.cpp +++ b/src/msw/timer.cpp @@ -49,19 +49,13 @@ WX_DECLARE_HASH_MAP( long, wxTimerMap wxTimerList; -void WINAPI _EXPORT wxTimerProc(HWND hwnd, WORD, int idTimer, DWORD); +void WINAPI wxTimerProc(HWND hwnd, WORD, int idTimer, DWORD); // ---------------------------------------------------------------------------- // macros // ---------------------------------------------------------------------------- -#ifdef __WIN32__ - #define _EXPORT -#else - #define _EXPORT _export -#endif - -// should probably be in wx/msw/private.h +// should probably be in wx/msw/missing.h #ifdef __WXMICROWIN__ #define MakeProcInstance(proc, hinst) proc #endif @@ -149,7 +143,7 @@ void wxProcessTimer(wxTimer& timer) timer.Notify(); } -void WINAPI _EXPORT wxTimerProc(HWND WXUNUSED(hwnd), WORD, int idTimer, DWORD) +void WINAPI wxTimerProc(HWND WXUNUSED(hwnd), WORD, int idTimer, DWORD) { wxTimerMap::iterator node = wxTimerList.find((long)idTimer); @@ -157,8 +151,7 @@ void WINAPI _EXPORT wxTimerProc(HWND WXUNUSED(hwnd), WORD, int idTimer, DWORD) wxASSERT_MSG( node != wxTimerList.end(), wxT("bogus timer id in wxTimerProc") ); wxProcessTimer(*(node->second)); - - // return 0; } #endif // wxUSE_TIMER +