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

replaced OnCtlColor(7 params) with MSWControlColor(1 param)

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30640 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2004-11-19 19:40:31 +00:00
parent f464a4f2af
commit 48fa6bd38a
18 changed files with 20 additions and 219 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
src/msw/window.cpp
View File

@@ -2706,12 +2706,7 @@ WXLRESULT wxWindowMSW::MSWWindowProc(WXUINT message, WXWPARAM wParam, WXLPARAM l
WXHWND hwnd;
UnpackCtlColor(wParam, lParam, &hdc, &hwnd);
processed = HandleCtlColor(&rc.hBrush,
(WXHDC)hdc,
(WXHWND)hwnd,
message,
wParam,
lParam);
processed = HandleCtlColor(&rc.hBrush, (WXHDC)hdc, (WXHWND)hwnd);
}
break;
#endif // !__WXMICROWIN__
@@ -3740,17 +3735,12 @@ bool wxWindowMSW::HandleDisplayChange()
#ifndef __WXMICROWIN__
bool wxWindowMSW::HandleCtlColor(WXHBRUSH *brush,
WXHDC pDC,
WXHWND pWnd,
WXUINT message,
WXWPARAM wParam,
WXLPARAM lParam)
bool wxWindowMSW::HandleCtlColor(WXHBRUSH *brush, WXHDC pDC, WXHWND pWnd)
{
#if wxUSE_CONTROLS
wxControl *item = (wxControl *)FindItemByHWND(pWnd, true);
wxWindow *item = FindItemByHWND(pWnd, true);
if ( item )
*brush = item->OnCtlColor(pDC, pWnd, 0, message, wParam, lParam);
*brush = item->MSWControlColor(pDC);
else
#endif // wxUSE_CONTROLS
*brush = NULL;
@@ -3760,17 +3750,6 @@ bool wxWindowMSW::HandleCtlColor(WXHBRUSH *brush,
#endif // __WXMICROWIN__
// Define for each class of dialog and control
WXHBRUSH wxWindowMSW::OnCtlColor(WXHDC hDC,
WXHWND WXUNUSED(hWnd),
WXUINT WXUNUSED(nCtlColor),
WXUINT WXUNUSED(message),
WXWPARAM WXUNUSED(wParam),
WXLPARAM WXUNUSED(lParam))
{
return MSWControlColor(hDC);
}
WXHBRUSH wxWindowMSW::MSWControlColor(WXHDC WXUNUSED(hDC))
{
return (WXHBRUSH)0;