updates from Adrián González Alba

[wxWidgets.git] / src / stc / ScintillaWX.cpp

diff --git a/src/stc/ScintillaWX.cpp b/src/stc/ScintillaWX.cpp
index 2d793a91570daeaea004b711dfe922cf58d2e96b..764048fbc2ef05e6af89c98e3e73cbe9021e57cb 100644 (file)
--- a/src/stc/ScintillaWX.cpp
+++ b/src/stc/ScintillaWX.cpp
@@ -328,17 +328,16 @@ void ScintillaWX::SetTicking(bool on) {
 
 void ScintillaWX::SetMouseCapture(bool on) {
     if (mouseDownCaptures) {
-        if (on && !stc->HasCapture())
+        if (on && !capturedMouse)
             stc->CaptureMouse();
-        else if (!on && stc->HasCapture())
+        else if (!on && capturedMouse && stc->HasCapture())
             stc->ReleaseMouse();
-        capturedMouse = stc->HasCapture();
+        capturedMouse = on;
     }
 }
 
 
 bool ScintillaWX::HaveMouseCapture() {
-    capturedMouse = stc->HasCapture();
     return capturedMouse;
 }
 
@@ -484,7 +483,10 @@ void ScintillaWX::Paste() {
     if (gotData) {
         wxString   text = wxTextBuffer::Translate(data.GetText(),
                                                   wxConvertEOLMode(pdoc->eolMode));
+  data.SetText(wxEmptyString); // free the data object content
         wxWX2MBbuf buf = (wxWX2MBbuf)wx2stc(text);
+  text = wxEmptyString; // free text
+
         int        len = strlen(buf);
         pdoc->InsertString(currentPos, buf, len);
         SetEmptySelection(currentPos + len);