Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

compilation fix for wxMSW and r52961

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@52962 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Václav Slavík
2008-04-01 15:40:49 +00:00
parent 16361ec941
commit f2a6c918e8
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
include/wx/scrolwin.h
View File

@@ -271,7 +271,7 @@ struct WXDLLIMPEXP_CORE wxScrolledT_Helper
const wxScrollHelperNative *helper, const wxScrollHelperNative *helper,
const wxSize& origBest); const wxSize& origBest);
#ifdef __WXMSW__ #ifdef __WXMSW__
static WXLRESULT FilterMSWWindowProc(WXLRESULT origResult); static WXLRESULT FilterMSWWindowProc(WXUINT nMsg, WXLRESULT origResult);
#endif #endif
}; };
@@ -325,7 +325,7 @@ public:
#ifdef __WXMSW__ #ifdef __WXMSW__
virtual WXLRESULT MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam) 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__

2
src/generic/scrlwing.cpp
View File

@@ -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__ #ifndef __WXWINCE__
// we need to process arrows ourselves for scrolling // we need to process arrows ourselves for scrolling