From bf6f4146d8ded3b68feb3b818f3cc3b1b0aa5650 Mon Sep 17 00:00:00 2001
From: Jochen Tucht <jtuc@users.sourceforge.net>
Date: Tue, 22 Jul 2008 16:31:42 +0000
Subject: [PATCH] VC6 issues

---
 Src/DirView.cpp         | 2 +-
 Src/LineFiltersList.cpp | 4 ++++
 Src/LocationView.cpp    | 3 ++-
 Src/MainFrm.cpp         | 2 +-
 Src/MergeEditView.cpp   | 2 +-
 Src/MovedLines.cpp      | 4 ++++
 Src/PluginsListDlg.cpp  | 2 +-
 7 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/Src/DirView.cpp b/Src/DirView.cpp
index e122b8135..17ebd2903 100644
--- a/Src/DirView.cpp
+++ b/Src/DirView.cpp
@@ -232,7 +232,7 @@ BEGIN_MESSAGE_MAP(CDirView, CListView)
 	ON_COMMAND(ID_EDIT_PASTE, OnEditPaste)
 	ON_COMMAND(ID_EDIT_UNDO, OnEditUndo)
 	ON_UPDATE_COMMAND_UI(ID_EDIT_UNDO, OnUpdateEditUndo)
-	ON_COMMAND(ID_PLUGINS_LIST, &CDirView::OnPluginsList)
+	ON_COMMAND(ID_PLUGINS_LIST, OnPluginsList)
 	//}}AFX_MSG_MAP
 	ON_NOTIFY_REFLECT(LVN_COLUMNCLICK, OnColumnClick)
 	ON_NOTIFY_REFLECT(LVN_ITEMCHANGED, OnItemChanged)
diff --git a/Src/LineFiltersList.cpp b/Src/LineFiltersList.cpp
index 1353ef2e5..9815b5463 100644
--- a/Src/LineFiltersList.cpp
+++ b/Src/LineFiltersList.cpp
@@ -6,6 +6,10 @@
 // ID line follows -- this is updated by SVN
 // $Id$
 
+// Disable VC6's "identifier was truncated..." warning. It is meaningless.
+#if _MSC_VER == 1200
+	#pragma warning(disable: 4786)
+#endif
 #include <windows.h>
 #include <vector>
 #include <assert.h>
diff --git a/Src/LocationView.cpp b/Src/LocationView.cpp
index 265e38b3e..821e2ac9a 100644
--- a/Src/LocationView.cpp
+++ b/Src/LocationView.cpp
@@ -913,7 +913,8 @@ void CLocationView::OnSize(UINT nType, int cx, int cy)
 			::PostMessage(m_hwndFrame, MSG_STORE_PANESIZES, 0, 0);
 	}
 
-	m_currentSize.SetSize(cx, cy);
+	m_currentSize.cx = cx;
+	m_currentSize.cy = cy;
 }
 
 /** 
diff --git a/Src/MainFrm.cpp b/Src/MainFrm.cpp
index 019b5c7a5..7b468c76e 100644
--- a/Src/MainFrm.cpp
+++ b/Src/MainFrm.cpp
@@ -217,7 +217,7 @@ BEGIN_MESSAGE_MAP(CMainFrame, CMDIFrameWnd)
 	ON_COMMAND(ID_HELP_RELEASENOTES, OnHelpReleasenotes)
 	ON_COMMAND(ID_HELP_TRANSLATIONS, OnHelpTranslations)
 	ON_COMMAND(ID_FILE_OPENCONFLICT, OnFileOpenConflict)
-	ON_COMMAND(ID_PLUGINS_LIST, &CMainFrame::OnPluginsList)
+	ON_COMMAND(ID_PLUGINS_LIST, OnPluginsList)
 	//}}AFX_MSG_MAP
 END_MESSAGE_MAP()
 
diff --git a/Src/MergeEditView.cpp b/Src/MergeEditView.cpp
index 0ee155058..6ab444fca 100644
--- a/Src/MergeEditView.cpp
+++ b/Src/MergeEditView.cpp
@@ -202,7 +202,7 @@ BEGIN_MESSAGE_MAP(CMergeEditView, CCrystalEditViewEx)
 	ON_COMMAND(ID_VIEW_ZOOMNORMAL, OnViewZoomNormal)
 	ON_UPDATE_COMMAND_UI(ID_STATUS_LEFTFILE_ENCODING, OnUpdateStatusLeftEncoding)
 	ON_UPDATE_COMMAND_UI(ID_STATUS_RIGHTFILE_ENCODING, OnUpdateStatusRightEncoding)
-	ON_COMMAND(ID_PLUGINS_LIST, &CMergeEditView::OnPluginsList)
+	ON_COMMAND(ID_PLUGINS_LIST, OnPluginsList)
 	//}}AFX_MSG_MAP
 END_MESSAGE_MAP()
 
diff --git a/Src/MovedLines.cpp b/Src/MovedLines.cpp
index bc22637cf..5c33d6673 100644
--- a/Src/MovedLines.cpp
+++ b/Src/MovedLines.cpp
@@ -4,6 +4,10 @@
  * @brief Implementation of MovedLines class.
  */
 
+// Disable VC6's "identifier was truncated..." warning. It is meaningless.
+#if _MSC_VER == 1200
+	#pragma warning(disable: 4786)
+#endif
 #include <map>
 #include "MovedLines.h"
 
diff --git a/Src/PluginsListDlg.cpp b/Src/PluginsListDlg.cpp
index d977408ce..c5d8acfe7 100644
--- a/Src/PluginsListDlg.cpp
+++ b/Src/PluginsListDlg.cpp
@@ -17,7 +17,7 @@
 IMPLEMENT_DYNAMIC(PluginsListDlg, CDialog)
 
 BEGIN_MESSAGE_MAP(PluginsListDlg, CDialog)
-	ON_BN_CLICKED(IDOK, &PluginsListDlg::OnBnClickedOk)
+	ON_BN_CLICKED(IDOK, OnBnClickedOk)
 END_MESSAGE_MAP()
 
 /**
-- 
2.11.0