implement wxLIST_AUTOSIZE support in wxMac's wxListCtrl

[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 43dbd7bffb75fdf1ce776ee0f8f52e4871137e7a..910dfc5fef3cf8bf35889154aa4200efd7815fae 100644 (file)
--- a/include/wx/mac/carbon/dataform.h
+++ b/include/wx/mac/carbon/dataform.h
@@ -12,16 +12,18 @@
 #ifndef _WX_MAC_DATAFORM_H
 #define _WX_MAC_DATAFORM_H
 
 #ifndef _WX_MAC_DATAFORM_H
 #define _WX_MAC_DATAFORM_H
 

-class WXDLLEXPORT wxDataFormat
+class WXDLLIMPEXP_CORE wxDataFormat

 {
 public:
     typedef unsigned long NativeFormat;
 
     wxDataFormat();
     wxDataFormat(wxDataFormatId vType);
 {
 public:
     typedef unsigned long NativeFormat;
 
     wxDataFormat();
     wxDataFormat(wxDataFormatId vType);

+    wxDataFormat(const wxDataFormat& rFormat);

     wxDataFormat(const wxString& rId);
     wxDataFormat(const wxChar* pId);
     wxDataFormat(NativeFormat vFormat);
     wxDataFormat(const wxString& rId);
     wxDataFormat(const wxChar* pId);
     wxDataFormat(NativeFormat vFormat);

+    ~wxDataFormat();

 
     wxDataFormat& operator=(NativeFormat vFormat)
         { SetId(vFormat); return *this; }
 
     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
     // 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; }
 
     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)
     // 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,14 +50,15 @@ public:
     // string ids are used for custom types - this SetId() must be used for
     // application-specific formats
     wxString GetId() const;
     // 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; }
     void SetType( wxDataFormatId type );
 
     // returns true if the format is one of those defined in wxDataFormatId
 
     // implementation
     wxDataFormatId GetType() const { return m_type; }
     void SetType( wxDataFormatId type );
 
     // returns true if the format is one of those defined in wxDataFormatId

-    bool IsStandard() const { return m_format > 0 && m_format < wxDF_PRIVATE; }
+    bool IsStandard() const { return m_type > 0 && m_type < wxDF_PRIVATE; }
+

 private:
     wxDataFormatId   m_type;
     NativeFormat     m_format;
 private:
     wxDataFormatId   m_type;
     NativeFormat     m_format;