diff options
| author | Neil <nyamatongwe@gmail.com> | 2014-08-19 09:56:33 +1000 |
|---|---|---|
| committer | Neil <nyamatongwe@gmail.com> | 2014-08-19 09:56:33 +1000 |
| commit | 41714edca6888c5bda41ad5302c5d2cd1eca88b5 (patch) | |
| tree | cc827de410e65655782a64930e4393a8fda680e1 /win32/ScintillaWin.cxx | |
| parent | 018905af4d2dace5439de1b3ef119af4529e9392 (diff) | |
| download | scintilla-mirror-41714edca6888c5bda41ad5302c5d2cd1eca88b5.tar.gz | |
Bug [#1636]. Support Visual Studio 2010+ line copy clipboard tag.
Diffstat (limited to 'win32/ScintillaWin.cxx')
| -rw-r--r-- | win32/ScintillaWin.cxx | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/win32/ScintillaWin.cxx b/win32/ScintillaWin.cxx index b69b3cadb..2ff660a09 100644 --- a/win32/ScintillaWin.cxx +++ b/win32/ScintillaWin.cxx @@ -197,6 +197,7 @@ class ScintillaWin : CLIPFORMAT cfColumnSelect; CLIPFORMAT cfBorlandIDEBlockType; CLIPFORMAT cfLineSelect; + CLIPFORMAT cfVSLineTag; HRESULT hrOle; DropSource ds; @@ -366,7 +367,8 @@ ScintillaWin::ScintillaWin(HWND hwnd) { // Likewise for line-copy (copies a full line when no text is selected) cfLineSelect = static_cast<CLIPFORMAT>( ::RegisterClipboardFormat(TEXT("MSDEVLineSelect"))); - + cfVSLineTag = static_cast<CLIPFORMAT>( + ::RegisterClipboardFormat(TEXT("VisualStudioEditorOperationsLineCutCopyClipboardTag"))); hrOle = E_FAIL; wMain = hwnd; @@ -1884,7 +1886,8 @@ void ScintillaWin::Paste() { if (!::OpenClipboard(MainHWND())) return; UndoGroup ug(pdoc); - const bool isLine = SelectionEmpty() && (::IsClipboardFormatAvailable(cfLineSelect) != 0); + const bool isLine = SelectionEmpty() && + (::IsClipboardFormatAvailable(cfLineSelect) || ::IsClipboardFormatAvailable(cfVSLineTag)); ClearSelection(multiPasteMode == SC_MULTIPASTE_EACH); bool isRectangular = (::IsClipboardFormatAvailable(cfColumnSelect) != 0); @@ -2451,6 +2454,7 @@ void ScintillaWin::CopyToClipboard(const SelectionText &selectedText) { if (selectedText.lineCopy) { ::SetClipboardData(cfLineSelect, 0); + ::SetClipboardData(cfVSLineTag, 0); } ::CloseClipboard(); |