X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/83df96d63a52ebb08b9e32549dc255354b4a18d0..d0960f6d3be27a47c2f4ba14542af6902c7e9ac7:/include/wx/x11/dataform.h

diff --git a/include/wx/x11/dataform.h b/include/wx/x11/dataform.h
index eebf507e23..56a956093f 100644
--- a/include/wx/x11/dataform.h
+++ b/include/wx/x11/dataform.h
@@ -9,10 +9,10 @@
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
 
-#ifndef _WX_MOTIF_DATAFORM_H
-#define _WX_MOTIF_DATAFORM_H
+#ifndef _WX_X11_DATAFORM_H
+#define _WX_X11_DATAFORM_H
 
-class wxDataFormat
+class WXDLLIMPEXP_CORE wxDataFormat
 {
 public:
     // the clipboard formats under Xt are Atoms
@@ -21,21 +21,20 @@ public:
     wxDataFormat();
     wxDataFormat( wxDataFormatId type );
     wxDataFormat( const wxString &id );
-    wxDataFormat( const wxChar *id );
     wxDataFormat( NativeFormat format );
     
     wxDataFormat& operator=(NativeFormat format)
-    { SetId(format); return *this; }
+        { SetId(format); return *this; }
     
     // comparison (must have both versions)
     bool operator==(NativeFormat format) const
-    { return m_format == (NativeFormat)format; }
+        { return m_format == (NativeFormat)format; }
     bool operator!=(NativeFormat format) const
-    { return m_format != (NativeFormat)format; }
+        { return m_format != (NativeFormat)format; }
     bool operator==(wxDataFormatId format) const
-    { return m_type == (wxDataFormatId)format; }
+        { return m_type == (wxDataFormatId)format; }
     bool operator!=(wxDataFormatId format) const
-    { return m_type != (wxDataFormatId)format; }
+        { 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
@@ -48,7 +47,7 @@ public:
     // 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;
@@ -62,5 +61,5 @@ private:
 };
 
 
-#endif // _WX_MOTIF_DATAFORM_H
+#endif // _WX_X11_DATAFORM_H