From: Takashi Sawanaka <sdottaka@users.sourceforge.net>
Date: Wed, 28 Jun 2017 15:03:59 +0000 (+0900)
Subject: Add GetDescription() function
X-Git-Tag: 2.16.4+-jp-10~422
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=d9271516ac34b8317d1fef4b8c8150209c80d4bd;p=winmerge-jp%2Fwinmerge-jp.git

Add GetDescription() function
---

diff --git a/Src/HexMergeDoc.h b/Src/HexMergeDoc.h
index bef319ba9..9076e009f 100644
--- a/Src/HexMergeDoc.h
+++ b/Src/HexMergeDoc.h
@@ -87,6 +87,7 @@ public:
 	void RefreshOptions();
 	bool OpenDocs(int nFiles, const FileLocation fileloc[], const bool bRO[], const String strDesc[], int nPane);
 	void CheckFileChanged(void);
+	String GetDescription(int pane) const { return m_strDesc[pane]; };
 private:
 	static void CopySel(CHexMergeView *pViewSrc, CHexMergeView *pViewDst);
 	static void CopyAll(CHexMergeView *pViewSrc, CHexMergeView *pViewDst);
diff --git a/Src/ImgMergeFrm.h b/Src/ImgMergeFrm.h
index 1064b2d24..939ce4b63 100644
--- a/Src/ImgMergeFrm.h
+++ b/Src/ImgMergeFrm.h
@@ -74,6 +74,7 @@ public:
 	bool IsModified() const;
 	bool IsFileChangedOnDisk(int pane) const;
 	void CheckFileChanged(void);
+	String GetDescription(int pane) const { return m_strDesc[pane]; }
 
 // Attributes
 protected:
diff --git a/Src/MergeDoc.h b/Src/MergeDoc.h
index a1952f71a..92d08447d 100644
--- a/Src/MergeDoc.h
+++ b/Src/MergeDoc.h
@@ -228,7 +228,8 @@ public:
 	bool DeleteSyncPoint(int pane, int nLine, bool bRescan = true);
 	void ClearSyncPoints();
 	bool HasSyncPoints();
-	std::vector<std::vector<int> > CMergeDoc::GetSyncPointList();
+	std::vector<std::vector<int> > GetSyncPointList();
+	String GetDescription(int pane) const { return m_strDesc[pane]; }
 
 	// Overrides
 	// ClassWizard generated virtual function overrides