fix for private access for wxTimerProc

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@825 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/include/wx/msw/timer.h b/include/wx/msw/timer.h
index 1db218cbfca63afac0ed7ccd2e50bb930492083a..a728aede1781dfc49b0a886ae9a1268c09826b5c 100644 (file)
--- a/include/wx/msw/timer.h
+++ b/include/wx/msw/timer.h
@@ -17,6 +17,8 @@
 #endif
 
 #include "wx/object.h"
+#include <windows.h>
+
 
 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 0896d3648d3e870336de4fc1a8b39b50f24d27f5..99cd51d92a116289d66b197d5e55a76dfb4f2dd6 100644 (file)
--- a/src/msw/timer.cpp
+++ b/src/msw/timer.cpp
@@ -41,8 +41,6 @@
 #define _EXPORT _export
 #endif
 
-#include <windows.h>
-
 wxList wxTimerList(wxKEY_INTEGER);
 UINT WINAPI _EXPORT wxTimerProc(HWND hwnd, WORD, int idTimer, DWORD);