Generate code using IsOk() instead of Ok() in stc.cpp.

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

diff --git a/include/wx/x11/dataform.h b/include/wx/x11/dataform.h
index eebf507e231af0d315d95c844590d2deaef2f7c9..66cfa711faff6ddfe1cbacf724f08482b551a758 100644 (file)
--- 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:
@@ -9,58 +9,57 @@
 // 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
     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; }
-    
+        { 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
     // 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 );
 };
 
 
-#endif // _WX_MOTIF_DATAFORM_H
+#endif // _WX_X11_DATAFORM_H