don't leak wxImageList if wxHF_CONTENTS is not used in wxHtmlHelpWindow

[wxWidgets.git] / include / wx / mac / carbon / dataform.h

diff --git a/include/wx/mac/carbon/dataform.h b/include/wx/mac/carbon/dataform.h
index 6de68218ad2cd1a4e02af4119d3f98068c691686..96a108c335c1ea6a208531ff6263fbaec9ed37b5 100644 (file)
--- 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; }
@@ -29,12 +31,14 @@ public:
     // comparison (must have both versions)
     bool operator==(const wxDataFormat& format) const ;
     bool operator!=(const wxDataFormat& format) const
-        { return ! ( *this != format ); }
+        { return ! ( *this == format ); }
     bool operator==(wxDataFormatId format) const
         { return m_type == (wxDataFormatId)format; }
     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; }
@@ -54,7 +58,7 @@ public:
 
     // returns true if the format is one of those defined in wxDataFormatId
     bool IsStandard() const { return m_type > 0 && m_type < wxDF_PRIVATE; }
-    
+
 private:
     wxDataFormatId   m_type;
     NativeFormat     m_format;