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

27
src/msw/choice.cpp
View File

@@ -582,8 +582,10 @@ WXLRESULT wxChoice::MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam)
WXHWND hwnd;
UnpackCtlColor(wParam, lParam, &hdc, &hwnd);
return (WXLRESULT)OnCtlColor(hdc, hwnd, 0,
nMsg, wParam, lParam);
WXHBRUSH hbr = MSWControlColor((WXHDC)hdc);
if ( hbr )
return (WXLRESULT)hbr;
//else: fall through to default window proc
}
}
@@ -615,24 +617,13 @@ bool wxChoice::MSWCommand(WXUINT param, WXWORD WXUNUSED(id))
return true;
}
WXHBRUSH wxChoice::OnCtlColor(WXHDC pDC, WXHWND WXUNUSED(pWnd), WXUINT WXUNUSED(nCtlColor),
WXUINT WXUNUSED(message),
WXWPARAM WXUNUSED(wParam),
WXLPARAM WXUNUSED(lParam)
)
WXHBRUSH wxChoice::MSWControlColor(WXHDC hDC)
{
HDC hdc = (HDC)pDC;
wxColour colBack = GetBackgroundColour();
if ( !IsEnabled() )
return MSWControlColorDisabled(hDC);
if (!IsEnabled())
colBack = wxSystemSettings::GetColour(wxSYS_COLOUR_3DFACE);
::SetBkColor(hdc, wxColourToRGB(colBack));
::SetTextColor(hdc, wxColourToRGB(GetForegroundColour()));
wxBrush *brush = wxTheBrushList->FindOrCreateBrush(colBack, wxSOLID);
return (WXHBRUSH)brush->GetResourceHandle();
return wxChoiceBase::MSWControlColorSolid(hDC);
}
#endif // wxUSE_CHOICE && !(__SMARTPHONE__ && __WXWINCE__)