X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/9691c806e6fbb08b01c9eec9998ad1e8242c7df3..835165d576b66441987b78519e6ef1fe74ea795a:/include/wx/x11/dataform.h?ds=sidebyside

diff --git a/include/wx/x11/dataform.h b/include/wx/x11/dataform.h
index 006f7b0e38..66cfa711fa 100644
--- a/include/wx/x11/dataform.h
+++ b/include/wx/x11/dataform.h
@@ -1,5 +1,5 @@
 ///////////////////////////////////////////////////////////////////////////////
-// Name:        motif/dataform.h
+// Name:        wx/x11/dataform.h
 // Purpose:     declaration of the wxDataFormat class
 // Author:      Robert Roebling
 // Modified by:
@@ -12,21 +12,20 @@
 #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 );
 };