superposition of text styles in wxTextCtrl now works as expected (and as documented)

[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 31af6d7da8fe7110dcf0622a86a9582919d68f55..8f8fb8f2354c6f4a8540f7527959c028adb75bb3 100644 (file)
--- a/include/wx/msw/ole/dataobj.h
+++ b/include/wx/msw/ole/dataobj.h
@@ -37,17 +37,25 @@ public:
     void SetAutoDelete();
 
     // return TRUE if we support this format in "Get" direction
     void SetAutoDelete();
 
     // return TRUE if we support this format in "Get" direction

-    bool IsSupportedFormat(const wxDataFormat& format) const;
+    bool IsSupportedFormat(const wxDataFormat& format) const
+        { return wxDataObjectBase::IsSupported(format, Get); }

 
 

-#ifdef __WXDEBUG__

     // function to return symbolic name of clipboard format (for debug messages)
     // 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) 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
 };