From 4c7e33c5ea8f4e68a1468333e26251d0271613b0 Mon Sep 17 00:00:00 2001 From: "Unknown (UG)" Date: Wed, 14 Oct 1998 16:43:19 +0000 Subject: [PATCH] fix for private access for wxTimerProc git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@825 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- include/wx/msw/timer.h | 4 ++++ src/msw/timer.cpp | 2 -- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/include/wx/msw/timer.h b/include/wx/msw/timer.h index 1db218cbfc..a728aede17 100644 --- a/include/wx/msw/timer.h +++ b/include/wx/msw/timer.h @@ -17,6 +17,8 @@ #endif #include "wx/object.h" +#include + class WXDLLEXPORT wxTimer : public wxObject { @@ -43,6 +45,8 @@ public: private: DECLARE_ABSTRACT_CLASS(wxTimer) + + friend UINT WINAPI wxTimerProc(HWND WXUNUSED(hwnd), WORD, int idTimer, DWORD); }; // Timer functions (milliseconds) diff --git a/src/msw/timer.cpp b/src/msw/timer.cpp index 0896d3648d..99cd51d92a 100644 --- a/src/msw/timer.cpp +++ b/src/msw/timer.cpp @@ -41,8 +41,6 @@ #define _EXPORT _export #endif -#include - wxList wxTimerList(wxKEY_INTEGER); UINT WINAPI _EXPORT wxTimerProc(HWND hwnd, WORD, int idTimer, DWORD);