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

correcting Drag Data handling for 'TEXT' and 'utxt'

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35256 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Stefan Csomor
2005-08-22 08:49:38 +00:00
parent 671478ee46
commit 6ac23e25b8
1 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/mac/carbon/dnd.cpp
View File

@@ -315,13 +315,18 @@ wxDragResult wxDropSource::DoDragDrop(int WXUNUSED(flags))
Ptr dataPtr = new char[dataSize] ; Ptr dataPtr = new char[dataSize] ;
m_data->GetDataHere( formats[i] , dataPtr ) ; m_data->GetDataHere( formats[i] , dataPtr ) ;
OSType type = formats[i].GetFormatId() ; OSType type = formats[i].GetFormatId() ;
if ( type == 'TEXT' ) if ( type == 'TEXT' || type == 'utxt' )
{ {
dataSize-- ; if ( dataSize > 0 )
dataSize-- ;
dataPtr[ dataSize ] = 0 ; dataPtr[ dataSize ] = 0 ;
wxString st( (wxChar*) dataPtr ) ; if ( type == 'utxt' )
wxCharBuffer buf = st.mb_str( wxConvLocal) ; {
AddDragItemFlavor(theDrag, theItem, type , buf.data(), strlen(buf), 0); if ( dataSize > 0 )
dataSize-- ;
dataPtr[ dataSize ] = 0 ;
}
AddDragItemFlavor(theDrag, theItem, type , dataPtr, dataSize, 0);
} }
else if (type == kDragFlavorTypeHFS ) else if (type == kDragFlavorTypeHFS )
{ {