Merge with stable

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

diff --git a/Src/DirActions.h b/Src/DirActions.h
index 4c52a2a..1f6e732 100644 (file)
--- a/Src/DirActions.h
+++ b/Src/DirActions.h
@@ -146,12 +146,12 @@ bool IsItemNavigableDiff(const CDiffContext& ctxt, const DIFFITEM & di);
 bool IsItemExistAll(const CDiffContext& ctxt, const DIFFITEM & di);
 bool IsShowable(const CDiffContext& ctxt, const DIFFITEM & di, const DirViewFilterSettings& filter);
 
-bool GetOpenOneItem(const CDiffContext& ctxt, uintptr_t pos1, const DIFFITEM **di1, const DIFFITEM **di2, const DIFFITEM **di3,
-               PathContext &paths, int & sel1, bool & isDir, String& errmsg);
-bool GetOpenTwoItems(const CDiffContext& ctxt, SELECTIONTYPE selectionType, uintptr_t pos1, uintptr_t pos2, const DIFFITEM **di1, const DIFFITEM **di2,
-               PathContext &paths, int & sel1, int & sel2, bool & isDir, String& errmsg);
-bool GetOpenThreeItems(const CDiffContext& ctxt, uintptr_t pos1, uintptr_t pos2, uintptr_t pos3, const DIFFITEM **di1, const DIFFITEM **di2, const DIFFITEM **di3,
-               PathContext &paths, int & sel1, int & sel2, int & sel3, bool & isDir, String& errmsg);
+bool GetOpenOneItem(const CDiffContext& ctxt, uintptr_t pos1, const DIFFITEM *pdi[3],
+               PathContext &paths, int & sel1, bool & isDir, int nPane[3], String& errmsg);
+bool GetOpenTwoItems(const CDiffContext& ctxt, SELECTIONTYPE selectionType, uintptr_t pos1, uintptr_t pos2, const DIFFITEM *pdi[3],
+               PathContext &paths, int & sel1, int & sel2, bool & isDir, int nPane[3], String& errmsg);
+bool GetOpenThreeItems(const CDiffContext& ctxt, uintptr_t pos1, uintptr_t pos2, uintptr_t pos3, const DIFFITEM *pdi[3],
+               PathContext &paths, int & sel1, int & sel2, int & sel3, bool & isDir, int nPane[3], String& errmsg);
 
 void GetItemFileNames(const CDiffContext& ctxt, const DIFFITEM& di, String& strLeft, String& strRight);
 PathContext GetItemFileNames(const CDiffContext& ctxt, const DIFFITEM& di);