X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/98ecad062135d7821740d9c92a9a61e1a676854b..0576cd9ebe3430bdf7acf69e1dd1df92273f32ad:/include/wx/dataobj.h?ds=sidebyside diff --git a/include/wx/dataobj.h b/include/wx/dataobj.h index 1dc04bef55..7eb724f395 100644 --- a/include/wx/dataobj.h +++ b/include/wx/dataobj.h @@ -246,7 +246,7 @@ private: // the one and only format we support wxDataFormat m_format; - DECLARE_NO_COPY_CLASS(wxDataObjectSimple) + wxDECLARE_NO_COPY_CLASS(wxDataObjectSimple); }; // ---------------------------------------------------------------------------- @@ -297,7 +297,7 @@ public: protected: // returns the pointer to the object which supports this format or NULL - wxDataObjectSimple *GetObject(const wxDataFormat& format) const; + wxDataObjectSimple *GetObject(const wxDataFormat& format, wxDataObjectBase::Direction dir=Get) const; private: // the list of all (simple) data objects whose formats we support @@ -309,7 +309,7 @@ private: wxDataFormat m_receivedFormat; - DECLARE_NO_COPY_CLASS(wxDataObjectComposite) + wxDECLARE_NO_COPY_CLASS(wxDataObjectComposite); }; // ============================================================================ @@ -393,7 +393,7 @@ public: private: wxString m_text; - DECLARE_NO_COPY_CLASS(wxTextDataObject) + wxDECLARE_NO_COPY_CLASS(wxTextDataObject); }; // ---------------------------------------------------------------------------- @@ -418,7 +418,7 @@ public: protected: wxBitmap m_bitmap; - DECLARE_NO_COPY_CLASS(wxBitmapDataObjectBase) + wxDECLARE_NO_COPY_CLASS(wxBitmapDataObjectBase); }; // ---------------------------------------------------------------------------- @@ -440,7 +440,7 @@ public: protected: wxArrayString m_filenames; - DECLARE_NO_COPY_CLASS(wxFileDataObjectBase) + wxDECLARE_NO_COPY_CLASS(wxFileDataObjectBase); }; // ---------------------------------------------------------------------------- @@ -501,7 +501,7 @@ private: size_t m_size; void *m_data; - DECLARE_NO_COPY_CLASS(wxCustomDataObject) + wxDECLARE_NO_COPY_CLASS(wxCustomDataObject); }; // ----------------------------------------------------------------------------