From a55f5a113613b2a0813e9e79c4d0b7f0bc1f8892 Mon Sep 17 00:00:00 2001 From: Julian Smart Date: Thu, 11 Dec 2003 11:32:44 +0000 Subject: [PATCH] Applied [ 857819 ] STC CopyToClipboard uses LF on win32 git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24767 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- contrib/src/stc/ScintillaWX.cpp | 3 ++- src/stc/ScintillaWX.cpp | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/contrib/src/stc/ScintillaWX.cpp b/contrib/src/stc/ScintillaWX.cpp index 6acb7805d1..1fbbf77860 100644 --- a/contrib/src/stc/ScintillaWX.cpp +++ b/contrib/src/stc/ScintillaWX.cpp @@ -19,6 +19,7 @@ #include "ExternalLexer.h" #include "wx/stc/stc.h" #include "PlatWX.h" +#include //---------------------------------------------------------------------- // Helper classes @@ -384,7 +385,7 @@ void ScintillaWX::Paste() { void ScintillaWX::CopyToClipboard(const SelectionText& st) { if (wxTheClipboard->Open()) { wxTheClipboard->UsePrimarySelection(FALSE); - wxString text = stc2wx(st.s, st.len); + wxString text = wxTextBuffer::Translate(stc2wx(st.s, st.len)); wxTheClipboard->SetData(new wxTextDataObject(text)); wxTheClipboard->Close(); } diff --git a/src/stc/ScintillaWX.cpp b/src/stc/ScintillaWX.cpp index 6acb7805d1..1fbbf77860 100644 --- a/src/stc/ScintillaWX.cpp +++ b/src/stc/ScintillaWX.cpp @@ -19,6 +19,7 @@ #include "ExternalLexer.h" #include "wx/stc/stc.h" #include "PlatWX.h" +#include //---------------------------------------------------------------------- // Helper classes @@ -384,7 +385,7 @@ void ScintillaWX::Paste() { void ScintillaWX::CopyToClipboard(const SelectionText& st) { if (wxTheClipboard->Open()) { wxTheClipboard->UsePrimarySelection(FALSE); - wxString text = stc2wx(st.s, st.len); + wxString text = wxTextBuffer::Translate(stc2wx(st.s, st.len)); wxTheClipboard->SetData(new wxTextDataObject(text)); wxTheClipboard->Close(); }