diff options
| author | Brad Anderson <eco@gnuk.net> | 2020-05-07 23:26:43 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-05-07 22:26:43 -0700 |
| commit | f2314218cdcfe2f3697b0314cd53dbd214963a8c (patch) | |
| tree | 527101697ee9bb82f6c92e37247351648cfaf105 | |
| parent | 4b7d4f53dde4abd42c3df33946ba7473805948db (diff) | |
| download | vcpkg-f2314218cdcfe2f3697b0314cd53dbd214963a8c.tar.gz vcpkg-f2314218cdcfe2f3697b0314cd53dbd214963a8c.zip | |
[wxwidgets] Apply fix for copy and paste macOS (#11178)
See wxWidget's Trac #18553
| -rw-r--r-- | ports/wxwidgets/CONTROL | 2 | ||||
| -rw-r--r-- | ports/wxwidgets/fix-macos-clipboard.patch | 26 | ||||
| -rw-r--r-- | ports/wxwidgets/portfile.cmake | 2 |
3 files changed, 28 insertions, 2 deletions
diff --git a/ports/wxwidgets/CONTROL b/ports/wxwidgets/CONTROL index e41e87222..e69ead3ad 100644 --- a/ports/wxwidgets/CONTROL +++ b/ports/wxwidgets/CONTROL @@ -1,5 +1,5 @@ Source: wxwidgets -Version: 3.1.3 +Version: 3.1.3-1 Homepage: https://github.com/wxWidgets/wxWidgets Description: wxWidgets is a widget toolkit and tools library for creating graphical user interfaces (GUIs) for cross-platform applications. Build-Depends: zlib, libpng, tiff, expat diff --git a/ports/wxwidgets/fix-macos-clipboard.patch b/ports/wxwidgets/fix-macos-clipboard.patch new file mode 100644 index 000000000..9f37cc1d9 --- /dev/null +++ b/ports/wxwidgets/fix-macos-clipboard.patch @@ -0,0 +1,26 @@ +diff --git a/src/osx/carbon/clipbrd.cpp b/src/osx/carbon/clipbrd.cpp +index 274e200..6012d37 100644 +--- a/src/osx/carbon/clipbrd.cpp ++++ b/src/osx/carbon/clipbrd.cpp +@@ -60,7 +60,11 @@ void wxClipboard::Clear() + + bool wxClipboard::Flush() + { +- return false; ++ wxCHECK_MSG( m_open, false, wxT("clipboard not open") ); ++ ++ wxOSXPasteboard::GetGeneralClipboard()->Flush(); ++ ++ return true; + } + + bool wxClipboard::Open() +@@ -105,6 +109,8 @@ bool wxClipboard::AddData( wxDataObject *data ) + + data->WriteToSink(wxOSXPasteboard::GetGeneralClipboard()); + ++ Flush(); ++ + m_data = data; + + return true; diff --git a/ports/wxwidgets/portfile.cmake b/ports/wxwidgets/portfile.cmake index e2cb15df1..530605782 100644 --- a/ports/wxwidgets/portfile.cmake +++ b/ports/wxwidgets/portfile.cmake @@ -5,7 +5,7 @@ vcpkg_from_github( REF v3.1.3 SHA512 4ecb5c2d13f9bda7aa3c12e887c351a0004509ec24bdd440542bec67e1b6dca20e7838a01236a71dd3cf2e1ba0653c40878047f406464cb2c9ee07c26d6f2599 HEAD_REF master - PATCHES disable-platform-lib-dir.patch + PATCHES disable-platform-lib-dir.patch fix-macos-clipboard.patch ) set(OPTIONS) |