Add GetDescription() function

diff --git a/Src/HexMergeDoc.h b/Src/HexMergeDoc.h
index bef319b..9076e00 100644 (file)
--- 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 1064b2d..939ce4b 100644 (file)
--- 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 a1952f7..92d0844 100644 (file)
--- 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