Autres/audacity
1
0
Fork 0
mirror of https://github.com/cookiengineer/audacity synced 2026-01-09 14:17:10 +01:00
Code Issues Releases Wiki Activity

Bug1579 NOT fixed by this...

Browse Source 
... but this may be a necessary piece of any fix that might be found.

See also recent commit c67842f525.

wxDF_UNICODETEXT replacing wxDF_TEXT was a necessary but not sufficient step to
fix a cut-copy-paste problem on Mac, and I suspect the same will be true here.

See also commits bbd369df1b and
9036c00152 for the commits that introduced this
code.

The partial fix they accomplished in 2.1.3 is no longer working, whether because
of wxWidgets changes, or macOS changes, or both.
This commit is contained in:
Paul Licameli
2020-12-03 19:35:13 -05:00
parent f4f8194dc6
commit 58df1342c2
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/widgets/FileDialog/mac/FileDialogPrivate.mm
View File

@@ -514,7 +514,7 @@ int FileDialog::ShowModal()
// the entire text field, ignoring the insertion cursor, and ignoring
// which control really has the focus.
id handler;
if (wxTheClipboard->IsSupported(wxDF_TEXT)) {
if (wxTheClipboard->IsSupported(wxDF_UNICODETEXT)) {
handler = [
NSEvent addLocalMonitorForEventsMatchingMask:NSKeyDownMask
handler:^NSEvent *(NSEvent *event)
@@ -581,7 +581,7 @@ int FileDialog::ShowModal()
[sPanel setNameFieldStringValue:file.AsNSString()];
returnCode = [sPanel runModal];
ModalFinishedCallback(sPanel, returnCode);
if (wxTheClipboard->IsSupported(wxDF_TEXT))
if (wxTheClipboard->IsSupported(wxDF_UNICODETEXT))
[NSEvent removeMonitor:handler];
}
else

4
src/widgets/valnum.cpp
View File

@@ -225,8 +225,8 @@ void NumValidatorBase::OnPaste(wxClipboardTextEvent& event)
}
wxClipboardLocker cb;
// if (!wxClipboard::Get()->IsSupported(wxDataFormat(wxDF_TEXT)))
if (!wxClipboard::Get()->IsSupported(wxDF_TEXT))
// if (!wxClipboard::Get()->IsSupported(wxDataFormat(wxDF_UNICODETEXT)))
if (!wxClipboard::Get()->IsSupported(wxDF_UNICODETEXT))
{
return;
}