diff options
| author | Neil <nyamatongwe@gmail.com> | 2020-05-02 07:55:30 +1000 |
|---|---|---|
| committer | Neil <nyamatongwe@gmail.com> | 2020-05-02 07:55:30 +1000 |
| commit | b9eddfa525c24eaf435800b192e23b0e692d9dcf (patch) | |
| tree | 90899ba5b212c1df4fecad2b65256e7db821b052 | |
| parent | 6b0a2b81ca2b4054a0598514535780d04b39db5b (diff) | |
| download | scintilla-mirror-b9eddfa525c24eaf435800b192e23b0e692d9dcf.tar.gz | |
Backport: Feature [feature-requests:1349] Define CopyAllowLine only on Editor, not subclass.
Backport of changeset 8223:a81895285b46.
| -rw-r--r-- | src/Editor.h | 2 | ||||
| -rw-r--r-- | win32/ScintillaWin.cxx | 7 |
2 files changed, 1 insertions, 8 deletions
diff --git a/src/Editor.h b/src/Editor.h index c21043881..eb87c470d 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 1c854a19a..0b7f6f77e 100644 --- a/win32/ScintillaWin.cxx +++ b/win32/ScintillaWin.cxx @@ -382,7 +382,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; @@ -2338,12 +2337,6 @@ void ScintillaWin::Copy() { } } -void ScintillaWin::CopyAllowLine() { - SelectionText selectedText; - CopySelectionRange(&selectedText, true); - CopyToClipboard(selectedText); -} - bool ScintillaWin::CanPaste() { if (!Editor::CanPaste()) return false; |