X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/0a0e6a5bafe2efb3466b1527eb7eb670aaa5e634..732d8c74f805e35cd398711fcd3969c4c668e259:/include/wx/msw/ole/droptgt.h diff --git a/include/wx/msw/ole/droptgt.h b/include/wx/msw/ole/droptgt.h index 6011cf67b5..0224655634 100644 --- a/include/wx/msw/ole/droptgt.h +++ b/include/wx/msw/ole/droptgt.h @@ -12,10 +12,6 @@ #ifndef _WX_OLEDROPTGT_H #define _WX_OLEDROPTGT_H -#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) -#pragma interface "droptgt.h" -#endif - #if wxUSE_DRAG_AND_DROP // ---------------------------------------------------------------------------- @@ -35,7 +31,7 @@ struct IDataObject; // (all of them, including protected ones which are called by the class itself) // ---------------------------------------------------------------------------- -class WXDLLEXPORT wxDropTarget : public wxDropTargetBase +class WXDLLIMPEXP_CORE wxDropTarget : public wxDropTargetBase { public: // ctor & dtor @@ -51,24 +47,27 @@ public: virtual bool OnDrop(wxCoord x, wxCoord y); virtual bool GetData(); + // Can only be called during OnXXX methods. + wxDataFormat GetMatchingPair(); + // implementation only from now on // ------------------------------- // do we accept this kind of data? - bool IsAcceptedData(IDataObject *pIDataSource) const; + bool MSWIsAcceptedData(IDataObject *pIDataSource) const; // give us the data source from IDropTarget::Drop() - this is later used by // GetData() when it's called from inside OnData() - void SetDataSource(IDataObject *pIDataSource); + void MSWSetDataSource(IDataObject *pIDataSource); private: // helper used by IsAcceptedData() and GetData() - wxDataFormat GetSupportedFormat(IDataObject *pIDataSource) const; + wxDataFormat MSWGetSupportedFormat(IDataObject *pIDataSource) const; wxIDropTarget *m_pIDropTarget; // the pointer to our COM interface IDataObject *m_pIDataSource; // the pointer to the source data object - DECLARE_NO_COPY_CLASS(wxDropTarget) + wxDECLARE_NO_COPY_CLASS(wxDropTarget); }; #endif //wxUSE_DRAG_AND_DROP