More work on getting wxLisBox events right

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

diff --git a/include/wx/motif/dataform.h b/include/wx/motif/dataform.h
index e6dbcb0a918afb34afe16377e3a88dc44b2664e2..314eaf5b6852f4fd8bdd9fa9aef724c10dc0840a 100644 (file)
--- a/include/wx/motif/dataform.h
+++ b/include/wx/motif/dataform.h
@@ -1,5 +1,5 @@
 ///////////////////////////////////////////////////////////////////////////////
 ///////////////////////////////////////////////////////////////////////////////

-// Name:        motif/dataform.h
+// Name:        wx/motif/dataform.h

 // Purpose:     declaration of the wxDataFormat class
 // Author:      Robert Roebling
 // Modified by:
 // Purpose:     declaration of the wxDataFormat class
 // Author:      Robert Roebling
 // Modified by:


@@ -12,7 +12,7 @@
 #ifndef _WX_MOTIF_DATAFORM_H
 #define _WX_MOTIF_DATAFORM_H
 
 #ifndef _WX_MOTIF_DATAFORM_H
 #define _WX_MOTIF_DATAFORM_H
 

-class wxDataFormat
+class WXDLLIMPEXP_CORE wxDataFormat

 {
 public:
     // the clipboard formats under Xt are Atoms
 {
 public:
     // the clipboard formats under Xt are Atoms


@@ -21,21 +21,20 @@ public:
     wxDataFormat();
     wxDataFormat( wxDataFormatId type );
     wxDataFormat( const wxString &id );
     wxDataFormat();
     wxDataFormat( wxDataFormatId type );
     wxDataFormat( const wxString &id );

-    wxDataFormat( const wxChar *id );

     wxDataFormat( NativeFormat format );
 
     wxDataFormat& operator=(NativeFormat format)
     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
 
     // 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
     bool operator!=(NativeFormat format) const

-        { return m_format != (NativeFormat)format; }
+    { return m_format != (NativeFormat)format; }

     bool operator==(wxDataFormatId format) const
     bool operator==(wxDataFormatId format) const

-        { return m_type == (wxDataFormatId)format; }
+    { return m_type == (wxDataFormatId)format; }

     bool operator!=(wxDataFormatId format) const
     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
 
     // 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;
     // 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;
 
     // implementation
     wxDataFormatId GetType() const;


@@ -63,4 +62,3 @@ private:
 
 
 #endif // _WX_MOTIF_DATAFORM_H
 
 
 #endif // _WX_MOTIF_DATAFORM_H

-