X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/03647350fc7cd141953c72e0284e928847d30f44..58ce18f2fdadecffb21e27555115af708325cf18:/include/wx/dataobj.h?ds=inline diff --git a/include/wx/dataobj.h b/include/wx/dataobj.h index e5d36e8675..d255a5064c 100644 --- a/include/wx/dataobj.h +++ b/include/wx/dataobj.h @@ -274,11 +274,17 @@ public: void Add(wxDataObjectSimple *dataObject, bool preferred = false); // Report the format passed to the SetData method. This should be the - // format of the data object within the composite that recieved data from + // format of the data object within the composite that received data from // the clipboard or the DnD operation. You can use this method to find - // out what kind of data object was recieved. + // out what kind of data object was received. wxDataFormat GetReceivedFormat() const; + // Returns the pointer to the object which supports this format or NULL. + // The returned pointer is owned by wxDataObjectComposite and must + // therefore not be destroyed by the caller. + wxDataObjectSimple *GetObject(const wxDataFormat& format, + wxDataObjectBase::Direction dir = Get) const; + // implement base class pure virtuals // ---------------------------------- virtual wxDataFormat GetPreferredFormat(wxDataObjectBase::Direction dir = Get) const; @@ -295,10 +301,6 @@ public: virtual size_t GetBufferOffset( const wxDataFormat& format ); #endif -protected: - // returns the pointer to the object which supports this format or NULL - wxDataObjectSimple *GetObject(const wxDataFormat& format, wxDataObjectBase::Direction dir=Get) const; - private: // the list of all (simple) data objects whose formats we support wxSimpleDataObjectList m_dataObjects;