wxCocoa: Basic support for font underlining:

[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 41b013a9e8335f5cdd4821b8e5cd1e07d7abbb39..0cb65ba03c64c67305daa90949e5f4a2dc96261f 100644 (file)
--- a/include/wx/msw/ole/dataobj.h
+++ b/include/wx/msw/ole/dataobj.h
@@ -36,21 +36,44 @@ public:
     // it is deleted, it should delete us as well
     void SetAutoDelete();
 
     // 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); }
 
     bool IsSupportedFormat(const wxDataFormat& format) const
         { return wxDataObjectBase::IsSupported(format, Get); }
 

-#ifdef __WXDEBUG__
+    // if this method returns false, this wxDataObject will be copied to
+    // the clipboard with its size prepended to it, which is compatible with
+    // older wx versions
+    //
+    // if returns true, then this wxDataObject will be copied to the clipboard
+    // without any additional information and ::HeapSize() function will be used
+    // to get the size of that data
+    virtual bool NeedsVerbatimData(const wxDataFormat& WXUNUSED(format)) const
+    {
+        // return false from here only for compatibility with earlier wx versions
+        return true;
+    }
+

     // function to return symbolic name of clipboard format (for debug messages)
     // function to return symbolic name of clipboard format (for debug messages)

+#ifdef __WXDEBUG__

     static const wxChar *GetFormatName(wxDataFormat format);
 
     #define wxGetFormatName(format) wxDataObject::GetFormatName(format)
 #else // !Debug
     static const wxChar *GetFormatName(wxDataFormat format);
 
     #define wxGetFormatName(format) wxDataObject::GetFormatName(format)
 #else // !Debug

-    #define wxGetFormatName(format) ""
+    #define wxGetFormatName(format) _T("")

 #endif // Debug/!Debug
 #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
 
 private:
     IDataObject *m_pIDataObject; // pointer to the COM interface

+
+    DECLARE_NO_COPY_CLASS(wxDataObject)

 };
 
 #endif  //_WX_MSW_OLE_DATAOBJ_H
 };
 
 #endif  //_WX_MSW_OLE_DATAOBJ_H