Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

allow the base class to participate in the CanPaste decision

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20512 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robin Dunn
2003-05-06 23:43:39 +00:00
parent fe3d9123c6
commit 0b887a21d4
2 changed files with 18 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
contrib/src/stc/ScintillaWX.cpp
View File

@@ -376,14 +376,16 @@ bool ScintillaWX::CanPaste() {
bool canPaste = FALSE; bool canPaste = FALSE;
bool didOpen; bool didOpen;
if ( (didOpen = !wxTheClipboard->IsOpened()) ) if (Editor::CanPaste()) {
wxTheClipboard->Open(); if ( (didOpen = !wxTheClipboard->IsOpened()) )
wxTheClipboard->Open();
if (wxTheClipboard->IsOpened()) { if (wxTheClipboard->IsOpened()) {
wxTheClipboard->UsePrimarySelection(FALSE); wxTheClipboard->UsePrimarySelection(FALSE);
canPaste = wxTheClipboard->IsSupported(wxUSE_UNICODE ? wxDF_UNICODETEXT : wxDF_TEXT); canPaste = wxTheClipboard->IsSupported(wxUSE_UNICODE ? wxDF_UNICODETEXT : wxDF_TEXT);
if (didOpen) if (didOpen)
wxTheClipboard->Close(); wxTheClipboard->Close();
}
} }
return canPaste; return canPaste;
} }

16
src/stc/ScintillaWX.cpp
View File

@@ -376,14 +376,16 @@ bool ScintillaWX::CanPaste() {
bool canPaste = FALSE; bool canPaste = FALSE;
bool didOpen; bool didOpen;
if ( (didOpen = !wxTheClipboard->IsOpened()) ) if (Editor::CanPaste()) {
wxTheClipboard->Open(); if ( (didOpen = !wxTheClipboard->IsOpened()) )
wxTheClipboard->Open();
if (wxTheClipboard->IsOpened()) { if (wxTheClipboard->IsOpened()) {
wxTheClipboard->UsePrimarySelection(FALSE); wxTheClipboard->UsePrimarySelection(FALSE);
canPaste = wxTheClipboard->IsSupported(wxUSE_UNICODE ? wxDF_UNICODETEXT : wxDF_TEXT); canPaste = wxTheClipboard->IsSupported(wxUSE_UNICODE ? wxDF_UNICODETEXT : wxDF_TEXT);
if (didOpen) if (didOpen)
wxTheClipboard->Close(); wxTheClipboard->Close();
}
} }
return canPaste; return canPaste;
} }