Use __DARWIN__ instead of __WXOSX__ in non-GUI code.

[wxWidgets.git] / include / wx / x11 / dataform.h

diff --git a/include/wx/x11/dataform.h b/include/wx/x11/dataform.h
index a565c4b41e93366769f8e3fefae645e0262707d9..66cfa711faff6ddfe1cbacf724f08482b551a758 100644 (file)
--- a/include/wx/x11/dataform.h
+++ b/include/wx/x11/dataform.h
@@ -1,32 +1,31 @@
 ///////////////////////////////////////////////////////////////////////////////
-// Name:        motif/dataform.h
+// Name:        wx/x11/dataform.h
 // Purpose:     declaration of the wxDataFormat class
 // Author:      Robert Roebling
 // Modified by:
 // Created:     19.10.99 (extracted from motif/dataobj.h)
 // RCS-ID:      $Id$
 // Copyright:   (c) 1999 Robert Roebling
-// Licence:     wxWidgets licence
+// Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_X11_DATAFORM_H
 #define _WX_X11_DATAFORM_H
 
-class wxDataFormat
+class WXDLLIMPEXP_CORE 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; }
-    
+
     // comparison (must have both versions)
     bool operator==(NativeFormat format) const
         { return m_format == (NativeFormat)format; }
@@ -36,27 +35,27 @@ public:
         { return m_type == (wxDataFormatId)format; }
     bool operator!=(wxDataFormatId format) const
         { 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 );
-    
+    void SetId( const wxString& id );
+
     // implementation
     wxDataFormatId GetType() const;
-    
+
 private:
     wxDataFormatId   m_type;
     NativeFormat     m_format;
-    
+
     void PrepareFormats();
     void SetType( wxDataFormatId type );
 };