VZ: I removed (CASTWNDPROC) from ::CallWndProc - it doesn't compile here with it
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@461 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -1223,7 +1223,7 @@ long wxMDIClientWindow::MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lPa
|
|||||||
long wxMDIClientWindow::MSWDefWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam)
|
long wxMDIClientWindow::MSWDefWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam)
|
||||||
{
|
{
|
||||||
if ( MSWGetOldWndProc() != 0)
|
if ( MSWGetOldWndProc() != 0)
|
||||||
return ::CallWindowProc(CASTWNDPROC (FARPROC) MSWGetOldWndProc(), (HWND) GetHWND(), (UINT) nMsg, (WPARAM) wParam, (LPARAM) lParam);
|
return ::CallWindowProc((FARPROC)MSWGetOldWndProc(), (HWND) GetHWND(), (UINT) nMsg, (WPARAM) wParam, (LPARAM) lParam);
|
||||||
else
|
else
|
||||||
return ::DefWindowProc((HWND) m_hWnd, (UINT) nMsg, (WPARAM) wParam, (LPARAM) lParam);
|
return ::DefWindowProc((HWND) m_hWnd, (UINT) nMsg, (WPARAM) wParam, (LPARAM) lParam);
|
||||||
}
|
}
|
||||||
|
@@ -45,7 +45,7 @@ long wxMiniFrame::MSWDefWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam
|
|||||||
(GetWindowStyleFlag() & wxTINY_CAPTION_VERT))
|
(GetWindowStyleFlag() & wxTINY_CAPTION_VERT))
|
||||||
return ::ibDefWindowProc((HWND) GetHWND(), nMsg, wParam, lParam);
|
return ::ibDefWindowProc((HWND) GetHWND(), nMsg, wParam, lParam);
|
||||||
else if ( m_oldWndProc )
|
else if ( m_oldWndProc )
|
||||||
return ::CallWindowProc(CASTWNDPROC (FARPROC) m_oldWndProc, (HWND) GetHWND(), (UINT) nMsg, (WPARAM) wParam, (LPARAM) lParam);
|
return ::CallWindowProc((FARPROC)m_oldWndProc, (HWND) GetHWND(), (UINT) nMsg, (WPARAM) wParam, (LPARAM) lParam);
|
||||||
else
|
else
|
||||||
return ::DefWindowProc((HWND) GetHWND(), nMsg, wParam, lParam);
|
return ::DefWindowProc((HWND) GetHWND(), nMsg, wParam, lParam);
|
||||||
}
|
}
|
||||||
|
Reference in New Issue
Block a user