fixing 'id' objc.h collisions, listbox rewrite

[wxWidgets.git] / include / wx / dataobj.h

diff --git a/include/wx/dataobj.h b/include/wx/dataobj.h
index 6c7c1d0d01e3ddba101ed1b6f89051bb43ea9f9e..174c649316d343fe9da6b6dd8319d19e67a32c0a 100644 (file)
--- a/include/wx/dataobj.h
+++ b/include/wx/dataobj.h
@@ -273,6 +273,12 @@ public:
     // one if preferred == true
     void Add(wxDataObjectSimple *dataObject, bool preferred = false);
 
     // one if preferred == true
     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
+    // the clipboard or the DnD operation.  You can use this method to find
+    // out what kind of data object was recieved.
+    wxDataFormat GetReceivedFormat() const;
+

     // implement base class pure virtuals
     // ----------------------------------
     virtual wxDataFormat GetPreferredFormat(wxDataObjectBase::Direction dir = Get) const;
     // implement base class pure virtuals
     // ----------------------------------
     virtual wxDataFormat GetPreferredFormat(wxDataObjectBase::Direction dir = Get) const;


@@ -301,6 +307,8 @@ private:
     // one is the preferred)
     size_t m_preferred;
 
     // one is the preferred)
     size_t m_preferred;
 

+    wxDataFormat m_receivedFormat;
+

     DECLARE_NO_COPY_CLASS(wxDataObjectComposite)
 };
 
     DECLARE_NO_COPY_CLASS(wxDataObjectComposite)
 };