compilation fix for wxMSW and r52961

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

diff --git a/include/wx/scrolwin.h b/include/wx/scrolwin.h
index 62ccdb04b13fb30b245a987d1d8f98fb9753ff42..570922a169f3455417dd9b1990b5fcd4dc631dd9 100644 (file)
--- 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__
                                  const wxScrollHelperNative *helper,
                                  const wxSize& origBest);
 #ifdef __WXMSW__

-    static WXLRESULT FilterMSWWindowProc(WXLRESULT origResult);
+    static WXLRESULT FilterMSWWindowProc(WXUINT nMsg, WXLRESULT origResult);

 #endif
 };
 
 #endif
 };
 


@@ -325,7 +325,7 @@ public:
 #ifdef __WXMSW__
     virtual WXLRESULT MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam)
     {
 #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__
 
     }
 #endif // __WXMSW__
 

diff --git a/src/generic/scrlwing.cpp b/src/generic/scrlwing.cpp
index 7d14e6a55682024b26b429dd725166c00291a3ab..13f1e7e5e0e8d12927694dc74414987961b69084 100644 (file)
--- a/src/generic/scrlwing.cpp
+++ b/src/generic/scrlwing.cpp
@@ -1450,7 +1450,7 @@ wxSize wxScrolledT_Helper::FilterBestSize(const wxWindow *win,
 }
 
 #ifdef __WXMSW__
 }
 
 #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
 {
 #ifndef __WXWINCE__
     // we need to process arrows ourselves for scrolling