From d6eee2018898f2442883a0aa77ad095b75572cfb Mon Sep 17 00:00:00 2001 From: George Hazan Date: Thu, 27 Aug 2015 15:15:33 +0000 Subject: fix for 64-bit issues & warnings git-svn-id: http://svn.miranda-ng.org/main/trunk@15043 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- plugins/NewAwaySysMod/src/ContactList.cpp | 4 ++-- plugins/NewAwaySysMod/src/MsgTree.cpp | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'plugins/NewAwaySysMod') diff --git a/plugins/NewAwaySysMod/src/ContactList.cpp b/plugins/NewAwaySysMod/src/ContactList.cpp index 355b51e037..2009d76839 100644 --- a/plugins/NewAwaySysMod/src/ContactList.cpp +++ b/plugins/NewAwaySysMod/src/ContactList.cpp @@ -409,7 +409,7 @@ HTREEITEM CCList::AddGroup(TCString GroupName) if (!GroupEnumData.hGroup) // means there is no such group in the groups list return NULL; - HTREEITEM hGroupItem = FindContact((MCONTACT)GroupEnumData.hGroup); + HTREEITEM hGroupItem = FindContact((UINT_PTR)GroupEnumData.hGroup); if (hGroupItem) return hGroupItem; // exists already, just return its handle @@ -427,7 +427,7 @@ HTREEITEM CCList::AddGroup(TCString GroupName) tvIns.item.mask = TVIF_TEXT | TVIF_STATE | TVIF_IMAGE | TVIF_SELECTEDIMAGE | TVIF_PARAM; tvIns.item.state = tvIns.item.stateMask = TVIS_BOLD | TVIS_EXPANDED; tvIns.item.iImage = tvIns.item.iSelectedImage = IMAGE_GROUPOPEN; - tvIns.item.lParam = Items.AddElem(CCLItemData((MCONTACT)GroupEnumData.hGroup)); + tvIns.item.lParam = Items.AddElem(CCLItemData((UINT_PTR)GroupEnumData.hGroup)); return TreeView_InsertItem(hTreeView, &tvIns); } diff --git a/plugins/NewAwaySysMod/src/MsgTree.cpp b/plugins/NewAwaySysMod/src/MsgTree.cpp index 25d5fff374..4ac3d313c6 100644 --- a/plugins/NewAwaySysMod/src/MsgTree.cpp +++ b/plugins/NewAwaySysMod/src/MsgTree.cpp @@ -656,7 +656,7 @@ CBaseTreeItem* CMsgTree::GetNextItem(int Flags, CBaseTreeItem *Item) // Item is COptItem_TreeCtrl *TreeCtrl = GetTreeCtrl(); CBaseTreeItem *TreeItem = Item; if (Flags & MTGN_BYID) { - int Order = TreeCtrl->IDToOrder((int)Item); + int Order = TreeCtrl->IDToOrder((INT_PTR)Item); _ASSERT(Order != -1); TreeItem = (Order <= TREECTRL_ROOTORDEROFFS) ? (CBaseTreeItem*)&TreeCtrl->RootItems[ROOT_ORDER_TO_INDEX(Order)] : (CBaseTreeItem*)&TreeCtrl->m_value[Order]; } -- cgit v1.2.3