X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/9726da4fd35db27e7210488ff431cb7a63f2f1ee..d75638f85f4f385f3cfdc3e8a2a9acc6a686e7b2:/include/wx/dataobj.h?ds=sidebyside diff --git a/include/wx/dataobj.h b/include/wx/dataobj.h index fad2dc6664..20428c455e 100644 --- a/include/wx/dataobj.h +++ b/include/wx/dataobj.h @@ -81,7 +81,9 @@ private: class WXDLLEXPORT wxPrivateDataObject : public wxDataObject { +#ifdef __WXGTK__ DECLARE_DYNAMIC_CLASS( wxPrivateDataObject ) +#endif public: wxPrivateDataObject(); @@ -109,7 +111,7 @@ public: wxString GetId() const { return m_format.GetId(); } // implement the base class pure virtuals - virtual wxDataFormatId GetPreferredFormat() const + virtual wxDataFormat GetPreferredFormat() const { return m_format; } virtual bool IsSupportedFormat(wxDataFormat format) const { return m_format == format; } @@ -118,16 +120,13 @@ public: virtual void GetDataHere(void *dest) const { WriteData(dest); } -protected: // the function which really copies the data - called by WriteData() above // and uses GetSize() to get the size of the data - // - // VZ: I really wonder why do we need it void WriteData( const void *data, void *dest ) const; private: // free the data - inline void Free(); + void Free(); // the data size_t m_size;