[Winmerge-svn] SF.net SVN: winmerge: [3622] trunk/Src
Windows visual diff and merge for files and directories
Brought to you by:
christianlist,
grimmdp
From: <ki...@us...> - 2006-09-23 07:14:03
|
Revision: 3622 http://svn.sourceforge.net/winmerge/?rev=3622&view=rev Author: kimmov Date: 2006-09-23 00:13:53 -0700 (Sat, 23 Sep 2006) Log Message: ----------- Couple of type fixes to CMoveConstraint Modified Paths: -------------- trunk/Src/Changes.txt trunk/Src/Common/CMoveConstraint.cpp trunk/Src/Common/CMoveConstraint.h Modified: trunk/Src/Changes.txt =================================================================== --- trunk/Src/Changes.txt 2006-09-22 18:57:08 UTC (rev 3621) +++ trunk/Src/Changes.txt 2006-09-23 07:13:53 UTC (rev 3622) @@ -2,6 +2,10 @@ Add new items to top. (This summarizes all changes to all files under Src, including Src\Languages.) +2006-09-23 Kimmo + Couple of type fixes to CMoveConstraint + Src/Common: CMoveConstraint.cpp CMoveConstraint.h + 2006-09-22 Kimmo PATCH: [ 1563157 ] Fix coretools.cpp for 64-bit Src/Common: coretools.cpp coretools.h Modified: trunk/Src/Common/CMoveConstraint.cpp =================================================================== --- trunk/Src/Common/CMoveConstraint.cpp 2006-09-22 18:57:08 UTC (rev 3621) +++ trunk/Src/Common/CMoveConstraint.cpp 2006-09-23 07:13:53 UTC (rev 3622) @@ -2,7 +2,7 @@ \file CMoveConstraint.cpp \author Perry Rapp, Creator, 1998-2004 \date Created: 1998 - \date Edited: 2005-07-26 (Perry Rapp) + \date Edited: 2006-09-23 (Kimmo Varis) \brief Implementation of CMoveConstraint @@ -346,7 +346,7 @@ /** * Chain to further CSubclass processing if appropriate */ -UINT +LRESULT CMoveConstraint::CallOriginalProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam) { #ifndef NOSUBCLASS @@ -357,7 +357,7 @@ ; #endif // NOSUBCLASS else - return 0; + return (LRESULT)0; } #ifndef NOSUBCLASS @@ -554,7 +554,7 @@ return false; if (m_nMinY == m_nMaxY) { - int nRet = CallOriginalProc(m_hwndDlg, msg, wParam, lParam); + LRESULT nRet = CallOriginalProc(m_hwndDlg, msg, wParam, lParam); switch(nRet) { case HTBOTTOMLEFT: @@ -574,7 +574,7 @@ } if (m_nMinX == m_nMaxX) { - int nRet = CallOriginalProc(m_hwndDlg, msg, wParam, lParam); + LRESULT nRet = CallOriginalProc(m_hwndDlg, msg, wParam, lParam); switch(nRet) { case HTBOTTOMLEFT: @@ -631,7 +631,7 @@ bool CMoveConstraint::OnTtnNeedText(TOOLTIPTEXT * pTTT, LRESULT * plresult) { - int id = pTTT->hdr.idFrom; + UINT id = pTTT->hdr.idFrom; UINT uflags = pTTT->uFlags; if (uflags & TTF_IDISHWND) id = GetDlgCtrlID((HWND)id); Modified: trunk/Src/Common/CMoveConstraint.h =================================================================== --- trunk/Src/Common/CMoveConstraint.h 2006-09-22 18:57:08 UTC (rev 3621) +++ trunk/Src/Common/CMoveConstraint.h 2006-09-23 07:13:53 UTC (rev 3622) @@ -2,7 +2,7 @@ \file CMoveConstraint.h \author Perry Rapp, Creator, 1998-2004 \date Created: 1998 - \date Edited: 2005-07-26 (Perry Rapp) + \date Edited: 2006-09-23 (Kimmo Varis) \brief Declaration of CMoveConstraint @@ -188,7 +188,7 @@ // handle WM_NOTIFY/TTN_NEEDTEXT combination bool OnTtnNeedText(TOOLTIPTEXT * pTTT, LRESULT * plresult); // forwarder - UINT CallOriginalProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam); + LRESULT CallOriginalProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam); bool PaintGrip(); void ClearMostData(); void DeleteAllConstraints(); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |