From d9271516ac34b8317d1fef4b8c8150209c80d4bd Mon Sep 17 00:00:00 2001 From: Takashi Sawanaka Date: Thu, 29 Jun 2017 00:03:59 +0900 Subject: [PATCH] Add GetDescription() function --- Src/HexMergeDoc.h | 1 + Src/ImgMergeFrm.h | 1 + Src/MergeDoc.h | 3 ++- 3 files changed, 4 insertions(+), 1 deletion(-) 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 > CMergeDoc::GetSyncPointList(); + std::vector > GetSyncPointList(); + String GetDescription(int pane) const { return m_strDesc[pane]; } // Overrides // ClassWizard generated virtual function overrides -- 2.11.0