More wxChar conversion

[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 06fcfd6a677587eb1a7a8e79abab7f8562428254..80a1e13e43175e6ae98261172724cd74e15797eb 100644 (file)
--- a/include/wx/msw/ole/dataobj.h
+++ b/include/wx/msw/ole/dataobj.h
@@ -87,7 +87,7 @@ class WXDLLEXPORT wxTextDataObject : public wxDataObject
 {
 public:
   // ctors
 {
 public:
   // ctors

-  wxTextDataObject();
+  wxTextDataObject() { }

   wxTextDataObject(const wxString& strText) : m_strText(strText) { }
   void Init(const wxString& strText) { m_strText = strText; }
 
   wxTextDataObject(const wxString& strText) : m_strText(strText) { }
   void Init(const wxString& strText) { m_strText = strText; }
 


@@ -131,17 +131,15 @@ public:
 
   virtual wxDataFormat GetFormat() const { return wxDF_BITMAP; }
 
 
   virtual wxDataFormat GetFormat() const { return wxDF_BITMAP; }
 

-/* ??

   // implement base class pure virtuals
   virtual wxDataFormat GetPreferredFormat() const
   // implement base class pure virtuals
   virtual wxDataFormat GetPreferredFormat() const

-    { return (wxDataFormat) wxDataObject::Text; }
+    { return (wxDataFormat) wxDataObject::Bitmap; }

   virtual bool IsSupportedFormat(wxDataFormat format) const
   virtual bool IsSupportedFormat(wxDataFormat format) const

-    { return format == wxDataObject::Text || format == wxDataObject::Locale; }
+    { return format == wxDataObject::Bitmap; }

   virtual size_t GetDataSize() const
   virtual size_t GetDataSize() const

-    { return m_strText.Len() + 1; } // +1 for trailing '\0'of course
+    { wxASSERT(false); return 0; } // BEMIMP

   virtual void GetDataHere(void *pBuf) const
   virtual void GetDataHere(void *pBuf) const

-    { memcpy(pBuf, m_strText.c_str(), GetDataSize()); }
-*/
+    { wxASSERT(false); } // BEMIMP

 
 private:
   wxBitmap  m_bitmap;
 
 private:
   wxBitmap  m_bitmap;