popup activation scope and l&f

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

diff --git a/include/wx/x11/dataform.h b/include/wx/x11/dataform.h
index a565c4b41e93366769f8e3fefae645e0262707d9..56a956093f6c6f64665d9ba10a7a44f0c09fce16 100644 (file)
--- a/include/wx/x11/dataform.h
+++ b/include/wx/x11/dataform.h
@@ -6,13 +6,13 @@
 // Created:     19.10.99 (extracted from motif/dataobj.h)
 // RCS-ID:      $Id$
 // Copyright:   (c) 1999 Robert Roebling
 // Created:     19.10.99 (extracted from motif/dataobj.h)
 // RCS-ID:      $Id$
 // Copyright:   (c) 1999 Robert Roebling

-// Licence:     wxWidgets licence
+// Licence:     wxWindows licence

 ///////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_X11_DATAFORM_H
 #define _WX_X11_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
 {
 public:
     // the clipboard formats under Xt are Atoms


@@ -21,7 +21,6 @@ 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)


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