Applied patch [ 903619 ] Win64 and Itanium support
by Brian Palmer git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25943 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -238,7 +238,7 @@ WXHBRUSH wxComboBox::OnCtlColor(WXHDC pDC,
|
||||
// wxComboBox callbacks
|
||||
// ----------------------------------------------------------------------------
|
||||
|
||||
long wxComboBox::MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam)
|
||||
WXLRESULT wxComboBox::MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam)
|
||||
{
|
||||
// handle WM_CTLCOLOR messages from our EDIT control to be able to set its
|
||||
// colour correctly (to be the same as our own one)
|
||||
@@ -253,7 +253,7 @@ long wxComboBox::MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam)
|
||||
WXHWND hwnd;
|
||||
UnpackCtlColor(wParam, lParam, &nCtlColor, &hdc, &hwnd);
|
||||
|
||||
return OnCtlColor(hdc, hwnd, nCtlColor, nMsg, wParam, lParam);
|
||||
return (WXLRESULT)OnCtlColor(hdc, hwnd, nCtlColor, nMsg, wParam, lParam);
|
||||
}
|
||||
|
||||
return wxChoice::MSWWindowProc(nMsg, wParam, lParam);
|
||||
|
Reference in New Issue
Block a user