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

Use wxCOMPtr<> for wxIDropTarget::m_pIDataObject

Browse Source 
Replace code manually calling AddRef/Release() on this pointer with a smart
pointer, this makes it shorter and safer.
This commit is contained in:
Vadim Zeitlin
2016-11-15 01:14:23 +01:00
parent 32ebf86ea1
commit da6faacd70
1 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -32,6 +32,7 @@
#endif #endif
#include "wx/msw/private.h" #include "wx/msw/private.h"
#include "wx/msw/private/comptr.h"
#include "wx/msw/wrapshl.h" // for DROPFILES structure #include "wx/msw/wrapshl.h" // for DROPFILES structure
@@ -90,7 +91,9 @@ public:
DECLARE_IUNKNOWN_METHODS; DECLARE_IUNKNOWN_METHODS;
protected: protected:
IDataObject *m_pIDataObject; // !NULL between DragEnter and DragLeave/Drop // This pointer is !NULL between the calls to DragEnter and DragLeave/Drop
wxCOMPtr<IDataObject> m_pIDataObject;
wxDropTarget *m_pTarget; // the real target (we're just a proxy) wxDropTarget *m_pTarget; // the real target (we're just a proxy)
HWND m_hwnd; // window we're associated with HWND m_hwnd; // window we're associated with
@@ -153,7 +156,6 @@ DWORD wxIDropTarget::GetDropEffect(DWORD flags,
wxIDropTarget::wxIDropTarget(wxDropTarget *pTarget) wxIDropTarget::wxIDropTarget(wxDropTarget *pTarget)
{ {
m_pTarget = pTarget; m_pTarget = pTarget;
m_pIDataObject = NULL;
} }
wxIDropTarget::~wxIDropTarget() wxIDropTarget::~wxIDropTarget()
@@ -186,8 +188,8 @@ STDMETHODIMP wxIDropTarget::DragEnter(IDataObject *pIDataSource,
{ {
wxLogTrace(wxTRACE_OleCalls, wxT("IDropTarget::DragEnter")); wxLogTrace(wxTRACE_OleCalls, wxT("IDropTarget::DragEnter"));
wxASSERT_MSG( m_pIDataObject == NULL, wxASSERT_MSG( !m_pIDataObject,
wxT("drop target must have data object") ); wxT("drop target can't already have a data object") );
// show the list of formats supported by the source data object for the // show the list of formats supported by the source data object for the
// debugging purposes, this is quite useful sometimes - please don't remove // debugging purposes, this is quite useful sometimes - please don't remove
@@ -225,7 +227,6 @@ STDMETHODIMP wxIDropTarget::DragEnter(IDataObject *pIDataSource,
// get hold of the data object // get hold of the data object
m_pIDataObject = pIDataSource; m_pIDataObject = pIDataSource;
m_pIDataObject->AddRef();
// we need client coordinates to pass to wxWin functions // we need client coordinates to pass to wxWin functions
if ( !ScreenToClient(m_hwnd, (POINT *)&pt) ) if ( !ScreenToClient(m_hwnd, (POINT *)&pt) )
@@ -317,7 +318,7 @@ STDMETHODIMP wxIDropTarget::DragLeave()
m_pTarget->OnLeave(); m_pTarget->OnLeave();
// release the held object // release the held object
RELEASE_AND_NULL(m_pIDataObject); m_pIDataObject.reset();
// update drag image // update drag image
m_pTarget->MSWUpdateDragImageOnLeave(); m_pTarget->MSWUpdateDragImageOnLeave();
@@ -378,7 +379,7 @@ STDMETHODIMP wxIDropTarget::Drop(IDataObject *pIDataSource,
} }
// release the held object // release the held object
RELEASE_AND_NULL(m_pIDataObject); m_pIDataObject.reset();
// update drag image // update drag image
m_pTarget->MSWUpdateDragImageOnData(pt.x, pt.y, m_pTarget->MSWUpdateDragImageOnData(pt.x, pt.y,