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 eebf507e231af0d315d95c844590d2deaef2f7c9..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,21 +12,20 @@
 #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
     typedef Atom NativeFormat;
 {
 public:
     // the clipboard formats under Xt are Atoms
     typedef Atom NativeFormat;

-    
+

     wxDataFormat();
     wxDataFormat( wxDataFormatId type );
     wxDataFormat( const wxString &id );
     wxDataFormat();
     wxDataFormat( wxDataFormatId type );
     wxDataFormat( const wxString &id );

-    wxDataFormat( const wxChar *id );

     wxDataFormat( NativeFormat format );
     wxDataFormat( NativeFormat format );

-    
+

     wxDataFormat& operator=(NativeFormat format)
     { SetId(format); return *this; }
     wxDataFormat& operator=(NativeFormat format)
     { SetId(format); return *this; }

-    
+

     // comparison (must have both versions)
     bool operator==(NativeFormat format) const
     { return m_format == (NativeFormat)format; }
     // comparison (must have both versions)
     bool operator==(NativeFormat format) const
     { return m_format == (NativeFormat)format; }


@@ -36,31 +35,30 @@ public:
     { return m_type == (wxDataFormatId)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; }

-    
+

     // 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; }
     // 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 );
     void SetId( NativeFormat format );

-    
+

     // 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;

-    
+

 private:
     wxDataFormatId   m_type;
     NativeFormat     m_format;
 private:
     wxDataFormatId   m_type;
     NativeFormat     m_format;

-    
+

     void PrepareFormats();
     void SetType( wxDataFormatId type );
 };
 
 
 #endif // _WX_MOTIF_DATAFORM_H
     void PrepareFormats();
     void SetType( wxDataFormatId type );
 };
 
 
 #endif // _WX_MOTIF_DATAFORM_H

-