X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/76db86e7e18d308dec0b0d6e9ab817775a8ab278..458ca8c1fdad48cf05476338b946634eec03fe16:/include/wx/motif/dataform.h diff --git a/include/wx/motif/dataform.h b/include/wx/motif/dataform.h index e6dbcb0a91..eebf507e23 100644 --- a/include/wx/motif/dataform.h +++ b/include/wx/motif/dataform.h @@ -17,46 +17,46 @@ class wxDataFormat public: // the clipboard formats under Xt are Atoms typedef Atom NativeFormat; - + wxDataFormat(); wxDataFormat( wxDataFormatId type ); wxDataFormat( const wxString &id ); wxDataFormat( const wxChar *id ); wxDataFormat( NativeFormat format ); - + wxDataFormat& operator=(NativeFormat format) - { SetId(format); return *this; } - + { SetId(format); return *this; } + // comparison (must have both versions) bool operator==(NativeFormat format) const - { return m_format == (NativeFormat)format; } + { return m_format == (NativeFormat)format; } bool operator!=(NativeFormat format) const - { return m_format != (NativeFormat)format; } + { return m_format != (NativeFormat)format; } bool operator==(wxDataFormatId format) const - { return m_type == (wxDataFormatId)format; } + { return m_type == (wxDataFormatId)format; } bool operator!=(wxDataFormatId format) const - { return m_type != (wxDataFormatId)format; } - + { return m_type != (wxDataFormatId)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) NativeFormat GetFormatId() const { return m_format; } operator NativeFormat() const { return m_format; } - + void SetId( NativeFormat format ); - + // string ids are used for custom types - this SetId() must be used for // application-specific formats wxString GetId() const; void SetId( const wxChar *id ); - + // implementation wxDataFormatId GetType() const; - + private: wxDataFormatId m_type; NativeFormat m_format; - + void PrepareFormats(); void SetType( wxDataFormatId type ); };