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

Correct the direction passed to wxDataObject in wxOSX clipboard code.

Browse Source 
Query for formats that wxDataObject supports on input, not output, in
wxClipboard::GetData().

This is similar to r69454 For wxGTK.

Closes #13649.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69729 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2011-11-10 11:49:02 +00:00
parent 60372b0d54
commit bbd65eb803
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/osx/carbon/clipbrd.cpp
View File

@@ -157,10 +157,10 @@ bool wxClipboard::GetData( wxDataObject& data )
wxCHECK_MSG( m_open, false, wxT("clipboard not open") );
size_t formatcount = data.GetFormatCount() + 1;
size_t formatcount = data.GetFormatCount(wxDataObject::Set) + 1;
wxDataFormat *array = new wxDataFormat[ formatcount ];
array[0] = data.GetPreferredFormat();
data.GetAllFormats( &array[1] );
array[0] = data.GetPreferredFormat(wxDataObject::Set);
data.GetAllFormats( &array[1], wxDataObject::Set );
bool transferred = false;