From: Robin Dunn <robin@alldunn.com>
Date: Tue, 6 May 2003 23:43:39 +0000 (+0000)
Subject: allow the base class to participate in the CanPaste decision
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/0b887a21d443c949d26be5f6530db3461f9e9d72

allow the base class to participate in the CanPaste decision


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20512 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---

diff --git a/contrib/src/stc/ScintillaWX.cpp b/contrib/src/stc/ScintillaWX.cpp
index 5f04433a23..059dd4afaa 100644
--- a/contrib/src/stc/ScintillaWX.cpp
+++ b/contrib/src/stc/ScintillaWX.cpp
@@ -376,14 +376,16 @@ bool ScintillaWX::CanPaste() {
     bool canPaste = FALSE;
     bool didOpen;
 
-    if ( (didOpen = !wxTheClipboard->IsOpened()) )
-        wxTheClipboard->Open();
+    if (Editor::CanPaste()) {
+        if ( (didOpen = !wxTheClipboard->IsOpened()) )
+            wxTheClipboard->Open();
 
-    if (wxTheClipboard->IsOpened()) {
-        wxTheClipboard->UsePrimarySelection(FALSE);
-        canPaste = wxTheClipboard->IsSupported(wxUSE_UNICODE ? wxDF_UNICODETEXT : wxDF_TEXT);
-        if (didOpen)
-            wxTheClipboard->Close();
+        if (wxTheClipboard->IsOpened()) {
+            wxTheClipboard->UsePrimarySelection(FALSE);
+            canPaste = wxTheClipboard->IsSupported(wxUSE_UNICODE ? wxDF_UNICODETEXT : wxDF_TEXT);
+            if (didOpen)
+                wxTheClipboard->Close();
+        }
     }
     return canPaste;
 }
diff --git a/src/stc/ScintillaWX.cpp b/src/stc/ScintillaWX.cpp
index 5f04433a23..059dd4afaa 100644
--- a/src/stc/ScintillaWX.cpp
+++ b/src/stc/ScintillaWX.cpp
@@ -376,14 +376,16 @@ bool ScintillaWX::CanPaste() {
     bool canPaste = FALSE;
     bool didOpen;
 
-    if ( (didOpen = !wxTheClipboard->IsOpened()) )
-        wxTheClipboard->Open();
+    if (Editor::CanPaste()) {
+        if ( (didOpen = !wxTheClipboard->IsOpened()) )
+            wxTheClipboard->Open();
 
-    if (wxTheClipboard->IsOpened()) {
-        wxTheClipboard->UsePrimarySelection(FALSE);
-        canPaste = wxTheClipboard->IsSupported(wxUSE_UNICODE ? wxDF_UNICODETEXT : wxDF_TEXT);
-        if (didOpen)
-            wxTheClipboard->Close();
+        if (wxTheClipboard->IsOpened()) {
+            wxTheClipboard->UsePrimarySelection(FALSE);
+            canPaste = wxTheClipboard->IsSupported(wxUSE_UNICODE ? wxDF_UNICODETEXT : wxDF_TEXT);
+            if (didOpen)
+                wxTheClipboard->Close();
+        }
     }
     return canPaste;
 }