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/HistoryStats/src/bandctrlimpl.cpp | 6 ++--- plugins/HistoryStats/src/bandctrlimpl.h | 31 ++++++++++++------------ plugins/HistoryStats/src/dlgfilterwords.cpp | 2 +- plugins/HistoryStats/src/dlgoption_subglobal.cpp | 2 +- plugins/HistoryStats/src/optionsctrlimpl.cpp | 6 ++--- plugins/HistoryStats/src/optionsctrlimpl.h | 12 ++++----- 6 files changed, 30 insertions(+), 29 deletions(-) (limited to 'plugins/HistoryStats') diff --git a/plugins/HistoryStats/src/bandctrlimpl.cpp b/plugins/HistoryStats/src/bandctrlimpl.cpp index 227c514ed2..d9a0151797 100644 --- a/plugins/HistoryStats/src/bandctrlimpl.cpp +++ b/plugins/HistoryStats/src/bandctrlimpl.cpp @@ -18,7 +18,7 @@ LRESULT CALLBACK BandCtrlImpl::staticWndProc(HWND hWnd, UINT msg, WPARAM wParam, switch (msg) { case WM_NCCREATE: - pCtrl = new BandCtrlImpl(hWnd, reinterpret_cast(reinterpret_cast(lParam)->hMenu)); + pCtrl = new BandCtrlImpl(hWnd, reinterpret_cast(reinterpret_cast(lParam)->hMenu)); SetWindowLongPtr(hWnd, 0, reinterpret_cast(pCtrl)); return TRUE; @@ -186,7 +186,7 @@ void BandCtrlImpl::unregisterClass() UnregisterClass(m_ClassName, g_hInst); } -BandCtrlImpl::BandCtrlImpl(HWND hWnd, int nOwnId) : +BandCtrlImpl::BandCtrlImpl(HWND hWnd, UINT_PTR nOwnId) : m_hWnd(hWnd), m_nOwnId(nOwnId), m_hFont(NULL), m_hTheme(NULL), m_hImageList(NULL), m_hImageListD(NULL), m_hTooltip(NULL), m_nCurHot(-1), m_nCurFocused(-1), m_nCurPressed(-1), m_bCurPressedDD(false), @@ -624,7 +624,7 @@ void BandCtrlImpl::recalcButtonRects() if (!m_hTooltip) m_hTooltip = CreateWindowEx(WS_EX_TOPMOST, TOOLTIPS_CLASS, _T(""), WS_POPUP, 0, 0, 0, 0, NULL, NULL, g_hInst, NULL); - TOOLINFO ti = { sizeof(TOOLINFO), TTF_SUBCLASS, m_hWnd, i + 1, m_Items[i].rItem, NULL, + TOOLINFO ti = { sizeof(TOOLINFO), TTF_SUBCLASS, m_hWnd, UINT_PTR(i+1), m_Items[i].rItem, NULL, const_cast(m_Items[i].tooltip.c_str()), // lpszText }; diff --git a/plugins/HistoryStats/src/bandctrlimpl.h b/plugins/HistoryStats/src/bandctrlimpl.h index 31320a9e40..a9df939a00 100644 --- a/plugins/HistoryStats/src/bandctrlimpl.h +++ b/plugins/HistoryStats/src/bandctrlimpl.h @@ -43,25 +43,26 @@ public: static void unregisterClass(); private: - HWND m_hWnd; - int m_nOwnId; - HFONT m_hFont; - HTHEME m_hTheme; - std::vector m_Items; + HWND m_hWnd; + UINT_PTR m_nOwnId; + HFONT m_hFont; + HTHEME m_hTheme; HIMAGELIST m_hImageList; HIMAGELIST m_hImageListD; - SIZE m_IconSize; - HWND m_hTooltip; - int m_nCurHot; - int m_nCurFocused; - int m_nCurPressed; - bool m_bCurPressedDD; - int m_nLayout; - int m_nDDWidth; - HICON m_hDDIcon; + SIZE m_IconSize; + HWND m_hTooltip; + int m_nCurHot; + int m_nCurFocused; + int m_nCurPressed; + bool m_bCurPressedDD; + int m_nLayout; + int m_nDDWidth; + HICON m_hDDIcon; + + std::vector m_Items; private: - explicit BandCtrlImpl(HWND hWnd, int nOwnId); + explicit BandCtrlImpl(HWND hWnd, UINT_PTR nOwnId); ~BandCtrlImpl(); private: diff --git a/plugins/HistoryStats/src/dlgfilterwords.cpp b/plugins/HistoryStats/src/dlgfilterwords.cpp index 0bbeb29b7f..4943be405d 100644 --- a/plugins/HistoryStats/src/dlgfilterwords.cpp +++ b/plugins/HistoryStats/src/dlgfilterwords.cpp @@ -155,7 +155,7 @@ void DlgFilterWords::onSetAdd() m_Filters.push_back(pFilter); - HANDLE hAdded = m_Sets.insertCheck(NULL, pFilter->getName().c_str(), 0, reinterpret_cast(pFilter)); + HANDLE hAdded = m_Sets.insertCheck(NULL, pFilter->getName().c_str(), 0, reinterpret_cast(pFilter)); m_Sets.selectItem(hAdded); } diff --git a/plugins/HistoryStats/src/dlgoption_subglobal.cpp b/plugins/HistoryStats/src/dlgoption_subglobal.cpp index 09208fa6d0..88a3cec5c7 100644 --- a/plugins/HistoryStats/src/dlgoption_subglobal.cpp +++ b/plugins/HistoryStats/src/dlgoption_subglobal.cpp @@ -120,7 +120,7 @@ INT_PTR CALLBACK DlgOption::SubGlobal::staticInfoProc(HWND hDlg, UINT msg, WPARA SetBkColor(hDC, GetSysColor(COLOR_WINDOW)); SetTextColor(hDC, GetSysColor(COLOR_WINDOWTEXT)); - return reinterpret_cast(GetSysColorBrush(COLOR_WINDOW)); + return reinterpret_cast(GetSysColorBrush(COLOR_WINDOW)); } break; } diff --git a/plugins/HistoryStats/src/optionsctrlimpl.cpp b/plugins/HistoryStats/src/optionsctrlimpl.cpp index 71929f166f..2687e385a7 100644 --- a/plugins/HistoryStats/src/optionsctrlimpl.cpp +++ b/plugins/HistoryStats/src/optionsctrlimpl.cpp @@ -25,8 +25,8 @@ LRESULT CALLBACK OptionsCtrlImpl::staticWndProc(HWND hWnd, UINT msg, WPARAM wPar pCS->style |= WS_CHILD; pCS->dwExStyle &= ~(WS_EX_CLIENTEDGE | WS_EX_STATICEDGE | WS_EX_WINDOWEDGE); - pCtrl = new OptionsCtrlImpl(hWnd, reinterpret_cast(pCS->hMenu)); - SetWindowLongPtr(hWnd, 0, reinterpret_cast(pCtrl)); + pCtrl = new OptionsCtrlImpl(hWnd, reinterpret_cast(pCS->hMenu)); + SetWindowLongPtr(hWnd, 0, reinterpret_cast(pCtrl)); } return pCtrl ? TRUE : FALSE; @@ -415,7 +415,7 @@ void OptionsCtrlImpl::unregisterClass() UnregisterClass(m_ClassName, g_hInst); } -OptionsCtrlImpl::OptionsCtrlImpl(HWND hWnd, int nOwnId) : +OptionsCtrlImpl::OptionsCtrlImpl(HWND hWnd, UINT_PTR nOwnId) : m_hWnd(hWnd), m_nOwnId(nOwnId), m_hTree(NULL), m_pfnOldTreeProc(NULL), m_bModified(true), m_hDragItem(NULL) { } diff --git a/plugins/HistoryStats/src/optionsctrlimpl.h b/plugins/HistoryStats/src/optionsctrlimpl.h index b2a2ee4d37..e931aa8933 100644 --- a/plugins/HistoryStats/src/optionsctrlimpl.h +++ b/plugins/HistoryStats/src/optionsctrlimpl.h @@ -359,15 +359,15 @@ public: static void unregisterClass(); private: - HWND m_hWnd; - int m_nOwnId; - HWND m_hTree; - WNDPROC m_pfnOldTreeProc; - bool m_bModified; + HWND m_hWnd; + UINT_PTR m_nOwnId; + HWND m_hTree; + WNDPROC m_pfnOldTreeProc; + bool m_bModified; HTREEITEM m_hDragItem; private: - explicit OptionsCtrlImpl(HWND hWnd, int nOwnId); + explicit OptionsCtrlImpl(HWND hWnd, UINT_PTR nOwnId); explicit OptionsCtrlImpl(const OptionsCtrlImpl& other); // no implementation const OptionsCtrlImpl& operator =(const OptionsCtrlImpl& other); // no implementation ~OptionsCtrlImpl(); -- cgit v1.2.3