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 0e6fed774ffd9efeac6135c9e397ab87f2476748..56a956093f6c6f64665d9ba10a7a44f0c09fce16 100644 (file)
--- a/include/wx/x11/dataform.h
+++ b/include/wx/x11/dataform.h
@@ -21,7 +21,6 @@ public:
     wxDataFormat();
     wxDataFormat( wxDataFormatId type );
     wxDataFormat( const wxString &id );
-    wxDataFormat( const wxChar *id );
     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;
-    void SetId( const wxChar *id );
+    void SetId( const wxString& id );
     
     // implementation
     wxDataFormatId GetType() const;