]> git.saurik.com Git - wxWidgets.git/commitdiff
Fixed pasting inefficiency
authorJulian Smart <julian@anthemion.co.uk>
Sun, 30 Dec 2007 14:20:49 +0000 (14:20 +0000)
committerJulian Smart <julian@anthemion.co.uk>
Sun, 30 Dec 2007 14:20:49 +0000 (14:20 +0000)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@50947 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

src/richtext/richtextbuffer.cpp

index 38de2d611a4def25d9965b601b4a486a948ef86c..4555750c05185cbcd2d6bcb288004f458914f4b4 100644 (file)
@@ -5603,9 +5603,20 @@ bool wxRichTextBuffer::PasteFromClipboard(long position)
                 wxTextDataObject data;
                 wxTheClipboard->GetData(data);
                 wxString text(data.GetText());
-                text.Replace(_T("\r\n"), _T("\n"));
-
-                InsertTextWithUndo(position+1, text, GetRichTextCtrl());
+#ifdef __WXMSW__
+                wxString text2;
+                text2.Alloc(text.Length()+1);
+                size_t i;
+                for (i = 0; i < text.Length(); i++)
+                {
+                    wxChar ch = text[i];
+                    if (ch != wxT('\r'))
+                        text2 += ch;
+                }
+#else
+                wxString text2 = text;
+#endif
+                InsertTextWithUndo(position+1, text2, GetRichTextCtrl());
 
                 success = true;
             }