wxSize needs to be fully defined if we want to use it inline here.

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

diff --git a/include/wx/msw/ole/dataobj.h b/include/wx/msw/ole/dataobj.h
index dd2d0cf5038c4f1efa3517c8e3a0d8b6a9081f21..0553a5a8c8a67a770133eff75d9486576fd375d5 100644 (file)
--- a/include/wx/msw/ole/dataobj.h
+++ b/include/wx/msw/ole/dataobj.h
@@ -36,21 +36,30 @@ public:
     // it is deleted, it should delete us as well
     void SetAutoDelete();
 
-    // return TRUE if we support this format in "Get" direction
+    // return true if we support this format in "Get" direction
     bool IsSupportedFormat(const wxDataFormat& format) const
         { return wxDataObjectBase::IsSupported(format, Get); }
 
-#ifdef __WXDEBUG__
     // function to return symbolic name of clipboard format (for debug messages)
-    static const char *GetFormatName(wxDataFormat format);
+#ifdef __WXDEBUG__
+    static const wxChar *GetFormatName(wxDataFormat format);
 
     #define wxGetFormatName(format) wxDataObject::GetFormatName(format)
 #else // !Debug
-    #define wxGetFormatName(format) ""
+    #define wxGetFormatName(format) _T("")
 #endif // Debug/!Debug
-
+    // they need to be accessed from wxIDataObject, so made them public,
+    // or wxIDataObject friend
+public:
+    virtual const void* GetSizeFromBuffer( const void* buffer, size_t* size,
+                                           const wxDataFormat& format );
+    virtual void* SetSizeInBuffer( void* buffer, size_t size,
+                                   const wxDataFormat& format );
+    virtual size_t GetBufferOffset( const wxDataFormat& format );
 private:
     IDataObject *m_pIDataObject; // pointer to the COM interface
+
+    DECLARE_NO_COPY_CLASS(wxDataObject)
 };
 
 #endif  //_WX_MSW_OLE_DATAOBJ_H