Block new frames being created in wxWebViewIE, bringing it into line with the other...

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

diff --git a/include/wx/x11/dataform.h b/include/wx/x11/dataform.h
index 0e6fed774ffd9efeac6135c9e397ab87f2476748..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:
@@ -17,16 +17,15 @@ 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; }
-    
+
     // comparison (must have both versions)
     bool operator==(NativeFormat format) const
         { return m_format == (NativeFormat)format; }
@@ -36,27 +35,27 @@ public:
         { 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; }
-    
+
     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 );
 };