comparison kdiff3/src/kreplacements/ShellContextMenu.cpp @ 70:5bbfe4784324

KDiff3 0.9.89 for Qt4

 #include <malloc.h>
 #include <qstring.h>
 #include <qstringlist.h>
 #include <qwidget.h>
 #include <qdir.h>
-#include <qpopupmenu.h>
+#include <QMenu>
 #include "ShellContextMenu.h"
 
 #ifdef _DEBUG
 #undef THIS_FILE
 static char THIS_FILE[]=__FILE__;

 
 #define MIN_ID 100
 #define MAX_ID 10000
 
 
-void showShellContextMenu( const QString& itemPath, QPoint pt, QWidget* pParentWidget, QPopupMenu* pMenu )
+void showShellContextMenu( const QString& itemPath, QPoint pt, QWidget* pParentWidget, QMenu* pMenu )
 {
     CShellContextMenu scm;
     scm.SetObjects(QDir::convertSeparators(itemPath));
     int id = scm.ShowContextMenu (pParentWidget, pt, pMenu);
     if (id>=1)

 	// call original WndProc of window to prevent undefined bevhaviour of window
 	return ::CallWindowProc ((WNDPROC) GetProp ( hWnd, TEXT ("OldWndProc")), hWnd, message, wParam, lParam);
 }
 
 
-UINT CShellContextMenu::ShowContextMenu(QWidget * pParentWidget, QPoint pt, QPopupMenu* pMenu )
+UINT CShellContextMenu::ShowContextMenu(QWidget * pParentWidget, QPoint pt, QMenu* pMenu )
 {
         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