X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/8276e7803de8ea246db7795741ac4abc4c074f43..233f573883834b6c86ad5a9d72fdb6a260f74f81:/include/wx/dataobj.h

diff --git a/include/wx/dataobj.h b/include/wx/dataobj.h
index 9421034bac..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;
@@ -328,7 +330,7 @@ private:
     #if defined(__WXGTK20__)
         #define wxNEEDS_UTF8_FOR_TEXT_DATAOBJ
     #elif defined(__WXMAC__)
-        #define wxNEEDS_UTF8_FOR_TEXT_DATAOBJ
+        #define wxNEEDS_UTF16_FOR_TEXT_DATAOBJ
     #endif
 #endif // wxUSE_UNICODE
 
@@ -515,7 +517,7 @@ private:
     #include "wx/gtk/dataobj2.h"
     // wxURLDataObject defined in msw/ole/dataobj2.h
 
-#else 
+#else
     #if defined(__WXGTK__)
         #include "wx/gtk1/dataobj2.h"
     #elif defined(__WXX11__)