X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/2845ddc25c401eab92825563a27aade46f7cfe3d..7740bc414353cf5c70ddef37b3700d35b7188d32:/include/wx/msw/ole/dataobj.h diff --git a/include/wx/msw/ole/dataobj.h b/include/wx/msw/ole/dataobj.h index 2699d3cbc4..80a1e13e43 100644 --- 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 - wxTextDataObject(); + wxTextDataObject() { } 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; } -/* ?? // implement base class pure virtuals virtual wxDataFormat GetPreferredFormat() const - { return (wxDataFormat) wxDataObject::Text; } + { return (wxDataFormat) wxDataObject::Bitmap; } virtual bool IsSupportedFormat(wxDataFormat format) const - { return format == wxDataObject::Text || format == wxDataObject::Locale; } + { return format == wxDataObject::Bitmap; } 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 - { memcpy(pBuf, m_strText.c_str(), GetDataSize()); } -*/ + { wxASSERT(false); } // BEMIMP private: wxBitmap m_bitmap; @@ -151,7 +149,7 @@ private: // wxMetaFileDataObject: see metafile.h is a specialization of wxDataObject for bitmap data // ---------------------------------------------------------------------------- -TODO: wxFileDataObject. +// TODO: wxFileDataObject. #endif //_WX_OLEDATAOBJ_H