From eeb78374523313ccb55b55ca54985fb3483615a4 Mon Sep 17 00:00:00 2001
From: Neil <nyamatongwe@gmail.com>
Date: Sat, 2 May 2020 07:55:30 +1000
Subject: Feature [feature-requests:1349] Define CopyAllowLine only on Editor,
 not subclass.

---
 src/Editor.h           | 2 +-
 win32/ScintillaWin.cxx | 7 -------
 2 files changed, 1 insertion(+), 8 deletions(-)

diff --git a/src/Editor.h b/src/Editor.h
index 57f8e5f22..80203d319 100644
--- a/src/Editor.h
+++ b/src/Editor.h
@@ -412,7 +412,7 @@ protected:	// ScintillaBase subclass needs access to much of Editor
 	virtual void Cut();
 	void PasteRectangular(SelectionPosition pos, const char *ptr, Sci::Position len);
 	virtual void Copy() = 0;
-	virtual void CopyAllowLine();
+	void CopyAllowLine();
 	virtual bool CanPaste();
 	virtual void Paste() = 0;
 	void Clear();
diff --git a/win32/ScintillaWin.cxx b/win32/ScintillaWin.cxx
index 51563f494..9f6066cb9 100644
--- a/win32/ScintillaWin.cxx
+++ b/win32/ScintillaWin.cxx
@@ -385,7 +385,6 @@ class ScintillaWin :
 	CaseFolder *CaseFolderForEncoding() override;
 	std::string CaseMapString(const std::string &s, int caseMapping) override;
 	void Copy() override;
-	void CopyAllowLine() override;
 	bool CanPaste() override;
 	void Paste() override;
 	void CreateCallTipWindow(PRectangle rc) override;
@@ -2357,12 +2356,6 @@ void ScintillaWin::Copy() {
 	}
 }
 
-void ScintillaWin::CopyAllowLine() {
-	SelectionText selectedText;
-	CopySelectionRange(&selectedText, true);
-	CopyToClipboard(selectedText);
-}
-
 bool ScintillaWin::CanPaste() {
 	if (!Editor::CanPaste())
 		return false;
-- 
cgit v1.2.3