wxTheColourDatabase->Find() can fail.

[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 cd623abee3211ed57cbd0f2ce845fe9f1e5726e4..6de68218ad2cd1a4e02af4119d3f98068c691686 100644 (file)
--- a/include/wx/mac/carbon/dataform.h
+++ b/include/wx/mac/carbon/dataform.h
@@ -6,7 +6,7 @@
 // Created:     10/21/99
 // RCS-ID:      $Id$
 // Copyright:   (c) 1999 Stefan Csomor
 // Created:     10/21/99
 // RCS-ID:      $Id$
 // Copyright:   (c) 1999 Stefan Csomor

-// Licence:     wxWidgets licence
+// Licence:     wxWindows licence

 ///////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_MAC_DATAFORM_H
 ///////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_MAC_DATAFORM_H


@@ -27,10 +27,9 @@ public:
         { SetId(vFormat); return *this; }
 
     // comparison (must have both versions)
         { SetId(vFormat); return *this; }
 
     // comparison (must have both versions)

-    bool operator==(NativeFormat format) const
-        { return m_format == (NativeFormat)format; }
-    bool operator!=(NativeFormat format) const
-        { return m_format != (NativeFormat)format; }
+    bool operator==(const wxDataFormat& format) const ;
+    bool operator!=(const wxDataFormat& format) const
+        { 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


@@ -53,9 +52,14 @@ public:
     wxDataFormatId GetType() const { return m_type; }
     void SetType( wxDataFormatId type );
 
     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_type > 0 && m_type < wxDF_PRIVATE; }
+    

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

+    // indicates the type in case of wxDF_PRIVATE :
+    wxString         m_id ;

 };
 
 #endif // _WX_MAC_DATAFORM_H
 };
 
 #endif // _WX_MAC_DATAFORM_H