Commit eac40c92 authored by Joachim Eibl's avatar Joachim Eibl

Fixed compile problems for win-64 bit version

git-svn-id: https://kdiff3.svn.sourceforge.net/svnroot/kdiff3/trunk@132 c8aa9fed-2811-0410-8543-893ada326672
parent 743c388f
......@@ -116,6 +116,6 @@ typedef ptrdiff_t lin;
#define LIN_MAX PTRDIFF_MAX
verify (lin_is_signed, TYPE_SIGNED (lin));
verify (lin_is_wide_enough, sizeof (ptrdiff_t) <= sizeof (lin));
verify (lin_is_printable_as_long, sizeof (lin) <= sizeof (long));
//verify (lin_is_printable_as_long, sizeof (lin) <= sizeof (long));
#endif
......@@ -178,7 +178,7 @@ UINT CShellContextMenu::ShowContextMenu(QWidget * pParentWidget, QPoint pt, QMen
WNDPROC OldWndProc;
if (iMenuType > 1) // only subclass if its version 2 or 3
{
OldWndProc = (WNDPROC) SetWindowLong (hWnd, GWL_WNDPROC, (DWORD) HookWndProc);
OldWndProc = (WNDPROC) SetWindowLongPtr (hWnd, GWLP_WNDPROC, (LONG_PTR) HookWndProc);
if (iMenuType == 2)
g_IContext2 = (LPCONTEXTMENU2) pContextMenu;
else // version 3
......@@ -190,7 +190,7 @@ UINT CShellContextMenu::ShowContextMenu(QWidget * pParentWidget, QPoint pt, QMen
UINT idCommand = TrackPopupMenu (m_hMenu,TPM_RETURNCMD | TPM_LEFTALIGN, pt.x(), pt.y(), 0, pParentWidget->winId(), 0);
if (OldWndProc) // unsubclass
SetWindowLong (hWnd, GWL_WNDPROC, (DWORD) OldWndProc);
SetWindowLongPtr (hWnd, GWLP_WNDPROC, (LONG_PTR) OldWndProc);
if (idCommand >= MIN_ID && idCommand <= MAX_ID) // see if returned idCommand belongs to shell menu entries
{
......
......@@ -81,7 +81,7 @@ static void showHelp()
#ifndef Q_OS_OS2
char buf[256];
HINSTANCE hi = FindExecutableA( helpFile.fileName().toAscii(), helpFile.absolutePath().toAscii(), buf );
if ( int(hi)<=32 )
if ( (quintptr)hi<=32 )
{
#endif
static QTextBrowser* pBrowser = 0;
......
......@@ -160,7 +160,9 @@ int main(int argc, char *argv[])
const QByteArray& appName = QByteArray("kdiff3");
const QByteArray& appCatalog = appName;
const KLocalizedString i18nName = ki18n("kdiff3");
const QByteArray& appVersion = QByteArray( VERSION );
QByteArray appVersion = QByteArray( VERSION );
if ( sizeof(void*)==8 )
appVersion += " (64 bit)";
const KLocalizedString description = ki18n("Tool for Comparison and Merge of Files and Directories");
const KLocalizedString copyright = ki18n("(c) 2002-2011 Joachim Eibl");
const QByteArray& homePage = "http://kdiff3.sourceforge.net/";
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment