X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/8f98c051f99d5fd7706dba30ae4e6b185bde073c..eeb0bee1d31939f8ff14a3c7dba6ff22fcdb6fff:/include/wx/mac/carbon/dataform.h diff --git a/include/wx/mac/carbon/dataform.h b/include/wx/mac/carbon/dataform.h index ffc4f87a42..96a108c335 100644 --- a/include/wx/mac/carbon/dataform.h +++ b/include/wx/mac/carbon/dataform.h @@ -19,9 +19,11 @@ public: wxDataFormat(); wxDataFormat(wxDataFormatId vType); + wxDataFormat(const wxDataFormat& rFormat); wxDataFormat(const wxString& rId); wxDataFormat(const wxChar* pId); wxDataFormat(NativeFormat vFormat); + ~wxDataFormat(); wxDataFormat& operator=(NativeFormat vFormat) { SetId(vFormat); return *this; } @@ -35,6 +37,8 @@ public: bool operator!=(wxDataFormatId format) const { return m_type != (wxDataFormatId)format; } + wxDataFormat& operator=(const wxDataFormat& format); + // explicit and implicit conversions to NativeFormat which is one of // standard data types (implicit conversion is useful for preserving the // compatibility with old code) @@ -46,7 +50,7 @@ public: // string ids are used for custom types - this SetId() must be used for // application-specific formats wxString GetId() const; - void SetId(const wxChar* pId); + void SetId(const wxString& pId); // implementation wxDataFormatId GetType() const { return m_type; }