Improve plugin system (#797)

[winmerge-jp/winmerge-jp.git] / Src / HexMergeFrm.h

diff --git a/Src/HexMergeFrm.h b/Src/HexMergeFrm.h
index 7b02e76..d7dcc81 100644 (file)
--- a/Src/HexMergeFrm.h
+++ b/Src/HexMergeFrm.h
@@ -1,21 +1,7 @@
 /////////////////////////////////////////////////////////////////////////////
 //    WinMerge:  an interactive diff/merge utility
 //    Copyright (C) 1997  Dean P. Grimm
-//
-//    This program is free software; you can redistribute it and/or modify
-//    it under the terms of the GNU General Public License as published by
-//    the Free Software Foundation; either version 2 of the License, or
-//    (at your option) any later version.
-//
-//    This program is distributed in the hope that it will be useful,
-//    but WITHOUT ANY WARRANTY; without even the implied warranty of
-//    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-//    GNU General Public License for more details.
-//
-//    You should have received a copy of the GNU General Public License
-//    along with this program; if not, write to the Free Software
-//    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-//
+//    SPDX-License-Identifier: GPL-2.0-or-later
 /////////////////////////////////////////////////////////////////////////////
 /** 
  * @file  HexMergeFrm.h
@@ -46,7 +32,6 @@ public:
 // Operations
 public:
        void UpdateResources();
-       void CloseNow();
        IHeaderBar * GetHeaderInterface();
        CHexMergeDoc * GetMergeDoc() { return m_pMergeDoc; }
 
@@ -60,6 +45,8 @@ protected:
        CSplitterWndEx m_wndSplitter;
        CEditorFilePathBar m_wndFilePathBar;
        CStatusBar m_wndStatusBar[3];
+       SCROLLINFO m_HScrollInfo[3];
+       SCROLLINFO m_VScrollInfo[3];
 // Overrides
 public:
        // ClassWizard generated virtual function overrides
@@ -74,6 +61,7 @@ public:
 // Implementation
 private:
        void SavePosition();
+       void SaveActivePane();
        virtual ~CHexMergeFrame();
        void CreateHexWndStatusBar(CStatusBar &, CWnd *);
 // Generated message map functions
@@ -89,3 +77,9 @@ private:
        //}}AFX_MSG
        DECLARE_MESSAGE_MAP()
 };
+
+inline IHeaderBar *CHexMergeFrame::GetHeaderInterface()
+{
+       return &m_wndFilePathBar;
+}
+