From f2a6c918e88aaa5373876be033568ba41497c968 Mon Sep 17 00:00:00 2001 From: =?utf8?q?V=C3=A1clav=20Slav=C3=ADk?= Date: Tue, 1 Apr 2008 15:40:49 +0000 Subject: [PATCH] compilation fix for wxMSW and r52961 git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@52962 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- include/wx/scrolwin.h | 4 ++-- src/generic/scrlwing.cpp | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/include/wx/scrolwin.h b/include/wx/scrolwin.h index 62ccdb04b1..570922a169 100644 --- a/include/wx/scrolwin.h +++ b/include/wx/scrolwin.h @@ -271,7 +271,7 @@ struct WXDLLIMPEXP_CORE wxScrolledT_Helper const wxScrollHelperNative *helper, const wxSize& origBest); #ifdef __WXMSW__ - static WXLRESULT FilterMSWWindowProc(WXLRESULT origResult); + static WXLRESULT FilterMSWWindowProc(WXUINT nMsg, WXLRESULT origResult); #endif }; @@ -325,7 +325,7 @@ public: #ifdef __WXMSW__ virtual WXLRESULT MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam) { - return FilterMSWWindowProc(T::MSWWindowProc(nMsg, wParam, lParam)); + return FilterMSWWindowProc(nMsg, T::MSWWindowProc(nMsg, wParam, lParam)); } #endif // __WXMSW__ diff --git a/src/generic/scrlwing.cpp b/src/generic/scrlwing.cpp index 7d14e6a556..13f1e7e5e0 100644 --- a/src/generic/scrlwing.cpp +++ b/src/generic/scrlwing.cpp @@ -1450,7 +1450,7 @@ wxSize wxScrolledT_Helper::FilterBestSize(const wxWindow *win, } #ifdef __WXMSW__ -WXLRESULT wxScrolledT_Helper::FilterMSWWindowProc(WXLRESULT rc) +WXLRESULT wxScrolledT_Helper::FilterMSWWindowProc(WXUINT nMsg, WXLRESULT rc) { #ifndef __WXWINCE__ // we need to process arrows ourselves for scrolling -- 2.45.2