Mercurial > hg > easyhg-kdiff3

diff kdiff3/src-QT4/kreplacements/ShellContextMenu.cpp @ 112:0180c7f92563

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Build fixes
author Chris Cannam
date Fri, 07 Dec 2018 13:40:01 +0000
parents 1184fc843210
children
line wrap: on
line diff
--- a/kdiff3/src-QT4/kreplacements/ShellContextMenu.cpp	Fri May 27 14:16:02 2016 +0100
+++ b/kdiff3/src-QT4/kreplacements/ShellContextMenu.cpp	Fri Dec 07 13:40:01 2018 +0000
@@ -148,7 +148,7 @@
 
 UINT CShellContextMenu::ShowContextMenu(QWidget * pParentWidget, QPoint pt, QMenu* pMenu )
 {
-        HWND hWnd = pParentWidget->winId();
+        HWND hWnd = (HWND)pParentWidget->winId();
         int iMenuType = 0;	// to know which version of IContextMenu is supported
 	LPCONTEXTMENU pContextMenu;	// common pointer to IContextMenu and higher version interface
    
@@ -187,7 +187,7 @@
 	else
 		OldWndProc = NULL;
 
-	UINT idCommand = TrackPopupMenu (m_hMenu,TPM_RETURNCMD | TPM_LEFTALIGN, pt.x(), pt.y(), 0, pParentWidget->winId(), 0);
+	UINT idCommand = TrackPopupMenu (m_hMenu,TPM_RETURNCMD | TPM_LEFTALIGN, pt.x(), pt.y(), 0, (HWND)pParentWidget->winId(), 0);
 
 	if (OldWndProc) // unsubclass
 		SetWindowLong (hWnd, GWL_WNDPROC, (DWORD) OldWndProc);