[OMPT-svn-commit] SF.net SVN: modplug:[4698] trunk/OpenMPT

[<sag...@us...>]

Revision: 4698
          http://sourceforge.net/p/modplug/code/4698
Author:   saga-games
Date:     2015-01-03 15:28:05 +0000 (Sat, 03 Jan 2015)
Log Message:
-----------
[Fix] Pattern tab: Plugin name box hit check didn't include the two rightmost pixels.
[Var] It's 2015.

Modified Paths:
--------------
    trunk/OpenMPT/LICENSE
    trunk/OpenMPT/common/version.cpp
    trunk/OpenMPT/installer/packageTemplate/readme.txt
    trunk/OpenMPT/mptrack/View_pat.cpp
    trunk/OpenMPT/mptrack/res/MPTRACK.RC2
    trunk/OpenMPT/packageTemplate/readme.txt

Modified: trunk/OpenMPT/LICENSE
===================================================================
--- trunk/OpenMPT/LICENSE	2015-01-02 10:29:06 UTC (rev 4697)
+++ trunk/OpenMPT/LICENSE	2015-01-03 15:28:05 UTC (rev 4698)
@@ -1,6 +1,6 @@
 The OpenMPT code is licensed under the BSD license.
  
-Copyright (c) 2004-2014, OpenMPT contributors
+Copyright (c) 2004-2015, OpenMPT contributors
 Copyright (c) 1997-2003, Olivier Lapicque
 All rights reserved.
 

Modified: trunk/OpenMPT/common/version.cpp
===================================================================
--- trunk/OpenMPT/common/version.cpp	2015-01-02 10:29:06 UTC (rev 4697)
+++ trunk/OpenMPT/common/version.cpp	2015-01-03 15:28:05 UTC (rev 4698)
@@ -397,12 +397,12 @@
 #else
 		"libopenmpt (based on OpenMPT / ModPlug Tracker)\n"
 #endif
-		"Copyright \xC2\xA9 2004-2014 Contributors\n"
+		"Copyright \xC2\xA9 2004-2015 Contributors\n"
 		"Copyright \xC2\xA9 1997-2003 Olivier Lapicque\n"
 		"\n"
 		"Contributors:\n"
-		"Johannes Schultz (2008-2014)\n"
-		"Joern Heusipp (2012-2014)\n"
+		"Johannes Schultz (2008-2015)\n"
+		"Joern Heusipp (2012-2015)\n"
 		"Ahti Lepp\xC3\xA4nen (2005-2011)\n"
 		"Robin Fernandes (2004-2007)\n"
 		"Sergiy Pylypenko (2007)\n"

Modified: trunk/OpenMPT/installer/packageTemplate/readme.txt
===================================================================
--- trunk/OpenMPT/installer/packageTemplate/readme.txt	2015-01-02 10:29:06 UTC (rev 4697)
+++ trunk/OpenMPT/installer/packageTemplate/readme.txt	2015-01-03 15:28:05 UTC (rev 4698)
@@ -60,7 +60,7 @@
 
 OpenMPT is partially under the following license:
 
-> Copyright (c) 2004-2014, OpenMPT contributors
+> Copyright (c) 2004-2015, OpenMPT contributors
 > Copyright (c) 1997-2003, Olivier Lapicque
 > All rights reserved.
 >

Modified: trunk/OpenMPT/mptrack/View_pat.cpp
===================================================================
--- trunk/OpenMPT/mptrack/View_pat.cpp	2015-01-02 10:29:06 UTC (rev 4697)
+++ trunk/OpenMPT/mptrack/View_pat.cpp	2015-01-03 15:28:05 UTC (rev 4698)
@@ -492,16 +492,15 @@
 	GetClientRect(&rcClient);
 	xofs = GetXScrollPos();
 	yofs = GetYScrollPos();
-	rect.SetRect(m_szHeader.cx, 0, m_szHeader.cx + GetColumnWidth() /*- 2*/, m_szHeader.cy);
-	plugRect.SetRect(m_szHeader.cx, m_szHeader.cy - m_szPluginHeader.cy, m_szHeader.cx + GetColumnWidth() - 2, m_szHeader.cy);	//rewbs.patPlugNames
+	rect.SetRect(m_szHeader.cx, 0, m_szHeader.cx + GetColumnWidth(), m_szHeader.cy);
+	plugRect.SetRect(m_szHeader.cx, m_szHeader.cy - m_szPluginHeader.cy, m_szHeader.cx + GetColumnWidth(), m_szHeader.cy);	//rewbs.patPlugNames
 
 	const CHANNELINDEX nmax = pSndFile->GetNumChannels();
 	// Checking channel headers
-	//rewbs.patPlugNames
 	if (m_Status[psShowPluginNames])
 	{
 		n = xofs;
-		for(UINT ihdr=0; n<nmax; ihdr++, n++)
+		for(CHANNELINDEX ihdr = 0; n < nmax; ihdr++, n++)
 		{
 			if (plugRect.PtInRect(point))
 			{
@@ -511,9 +510,8 @@
 			plugRect.OffsetRect(GetColumnWidth(), 0);
 		}
 	}
-	//end rewbs.patPlugNames
 	n = xofs;
-	for (UINT ihdr=0; n<nmax; ihdr++, n++)
+	for (CHANNELINDEX ihdr=0; n<nmax; ihdr++, n++)
 	{
 		if (rect.PtInRect(point))
 		{

Modified: trunk/OpenMPT/mptrack/res/MPTRACK.RC2
===================================================================
--- trunk/OpenMPT/mptrack/res/MPTRACK.RC2	2015-01-02 10:29:06 UTC (rev 4697)
+++ trunk/OpenMPT/mptrack/res/MPTRACK.RC2	2015-01-03 15:28:05 UTC (rev 4698)
@@ -43,7 +43,7 @@
             VALUE "FileDescription", "OpenMPT / ModPlug Tracker"
             VALUE "FileVersion", VER_FILEVERSION_STR
             VALUE "InternalName", "ModPlug Tracker"
-            VALUE "LegalCopyright", "Copyright \xA91997-2003 Olivier Lapicque; \xA92004-2014 contributors."
+            VALUE "LegalCopyright", "Copyright \xA91997-2003 Olivier Lapicque; \xA92004-2015 contributors."
             VALUE "LegalTrademarks", "M.O.D.P.L.U.G"
             VALUE "OriginalFilename", "mptrack.exe"
 			VALUE "PrivateBuild", ""

Modified: trunk/OpenMPT/packageTemplate/readme.txt
===================================================================
--- trunk/OpenMPT/packageTemplate/readme.txt	2015-01-02 10:29:06 UTC (rev 4697)
+++ trunk/OpenMPT/packageTemplate/readme.txt	2015-01-03 15:28:05 UTC (rev 4698)
@@ -76,7 +76,7 @@
 
 OpenMPT is partially under the following license:
 
-> Copyright (c) 2004-2014, OpenMPT contributors
+> Copyright (c) 2004-2015, OpenMPT contributors
 > Copyright (c) 1997-2003, Olivier Lapicque
 > All rights reserved.
 >

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.