compilation fix for VC6 with standard (i.e. not updated) SDK (patch 1828610)

[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..7fa7cb6e0c9b5e4d710ad97151ebd27a16f65c22 100644 (file)
--- a/include/wx/mac/carbon/dataform.h
+++ b/include/wx/mac/carbon/dataform.h
@@ -20,7 +20,6 @@ public:
     wxDataFormat();
     wxDataFormat(wxDataFormatId vType);
     wxDataFormat(const wxString& rId);
     wxDataFormat();
     wxDataFormat(wxDataFormatId vType);
     wxDataFormat(const wxString& rId);

-    wxDataFormat(const wxChar* pId);

     wxDataFormat(NativeFormat vFormat);
 
     wxDataFormat& operator=(NativeFormat vFormat)
     wxDataFormat(NativeFormat vFormat);
 
     wxDataFormat& operator=(NativeFormat vFormat)


@@ -29,7 +28,7 @@ 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
     bool operator==(wxDataFormatId format) const
         { return m_type == (wxDataFormatId)format; }
     bool operator!=(wxDataFormatId format) const


@@ -46,14 +45,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;