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

traces of my debugging session, no real changes

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11384 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin 2001-08-15 14:27:22 +00:00
parent d7eee191c5
commit c5639a8767
3 changed files with 32 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/msw/clipbrd.cpp
View File

@ -633,7 +633,7 @@ bool wxClipboard::GetData( wxDataObject& data )
// build the list of supported formats
size_t nFormats = data.GetFormatCount(wxDataObject::Set);
wxDataFormat format;
wxDataFormat *formats;
wxDataFormat *formats;
if ( nFormats == 1 )
{
// the most common case

7
src/msw/ole/dataobj.cpp
View File

@ -62,7 +62,7 @@
#ifdef __WXDEBUG__
static const wxChar *GetTymedName(DWORD tymed);
#else // !Debug
#define GetTymedName(tymed) ""
#define GetTymedName(tymed) _T("")
#endif // Debug/!Debug
// ----------------------------------------------------------------------------
@ -621,7 +621,7 @@ STDMETHODIMP wxIDataObject::EnumFormatEtc(DWORD dwDir,
size_t nFormatCount = m_pDataObject->GetFormatCount(dir);
wxDataFormat format;
wxDataFormat *formats;
wxDataFormat *formats;
formats = nFormatCount == 1 ? &format : new wxDataFormat[nFormatCount];
m_pDataObject->GetAllFormats(formats, dir);
@ -1029,7 +1029,8 @@ bool wxFileDataObject::GetDataHere(void *pData) const
*pbuf++ = wxT('\0');
}
*pbuf = wxT('\0'); // add final null terminator
// add final null terminator
*pbuf = wxT('\0');
return TRUE;
}

32
src/msw/ole/droptgt.cpp
View File

@ -142,9 +142,31 @@ STDMETHODIMP wxIDropTarget::DragEnter(IDataObject *pIDataSource,
POINTL pt,
DWORD *pdwEffect)
{
wxLogDebug(wxT("IDropTarget::DragEnter"));
wxLogTrace(wxTRACE_OleCalls, wxT("IDropTarget::DragEnter"));
wxASSERT( m_pIDataObject == NULL );
wxASSERT_MSG( m_pIDataObject == NULL,
_T("drop target must have data object") );
// show the list of formats supported by the source data object for the
// debugging purposes
#if 0
IEnumFORMATETC *penumFmt;
if ( SUCCEEDED(pIDataSource->EnumFormatEtc(DATADIR_GET, &penumFmt)) )
{
FORMATETC fmt;
while ( penumFmt->Next(1, &fmt, NULL) == S_OK )
{
wxLogDebug(_T("Drop source supports format %s"),
wxDataObject::GetFormatName(fmt.cfFormat));
}
penumFmt->Release();
}
else
{
wxLogLastError(_T("IDataObject::EnumFormatEtc"));
}
#endif // 0
if ( !m_pTarget->IsAcceptedData(pIDataSource) ) {
// we don't accept this kind of data
@ -216,7 +238,7 @@ STDMETHODIMP wxIDropTarget::DragOver(DWORD grfKeyState,
// Notes : good place to do any clean-up
STDMETHODIMP wxIDropTarget::DragLeave()
{
wxLogDebug(wxT("IDropTarget::DragLeave"));
wxLogTrace(wxTRACE_OleCalls, wxT("IDropTarget::DragLeave"));
// remove the UI feedback
m_pTarget->OnLeave();
@ -241,7 +263,7 @@ STDMETHODIMP wxIDropTarget::Drop(IDataObject *pIDataSource,
POINTL pt,
DWORD *pdwEffect)
{
wxLogDebug(wxT("IDropTarget::Drop"));
wxLogTrace(wxTRACE_OleCalls, wxT("IDropTarget::Drop"));
// TODO I don't know why there is this parameter, but so far I assume
// that it's the same we've already got in DragEnter
@ -425,7 +447,7 @@ wxDataFormat wxDropTarget::GetSupportedFormat(IDataObject *pIDataSource) const
// get the list of supported formats
size_t nFormats = m_dataObject->GetFormatCount(wxDataObject::Set);
wxDataFormat format;
wxDataFormat *formats;
wxDataFormat *formats;
formats = nFormats == 1 ? &format : new wxDataFormat[nFormats];
m_dataObject->GetAllFormats(formats, wxDataObject::Set);