Minor corrections to make dist after reports

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

diff --git a/include/wx/gtk/dataform.h b/include/wx/gtk/dataform.h
index a0618e01af5761bb53481c6d630e325d6652fe8e..86e0cd783804eb16b4c6d63e5e597e2d6dbaa64a 100644 (file)
--- a/include/wx/gtk/dataform.h
+++ b/include/wx/gtk/dataform.h
@@ -12,7 +12,7 @@
 #ifndef _WX_GTK_DATAFORM_H
 #define _WX_GTK_DATAFORM_H
 
 #ifndef _WX_GTK_DATAFORM_H
 #define _WX_GTK_DATAFORM_H
 

-class wxDataFormat
+class WXDLLIMPEXP_CORE wxDataFormat

 {
 public:
     // the clipboard formats under GDK are GdkAtoms
 {
 public:
     // the clipboard formats under GDK are GdkAtoms


@@ -20,10 +20,24 @@ public:
 
     wxDataFormat();
     wxDataFormat( wxDataFormatId type );
 
     wxDataFormat();
     wxDataFormat( wxDataFormatId type );

-    wxDataFormat( const wxString &id );
-    wxDataFormat( const wxChar *id );

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

+    // we have to provide all the overloads to allow using strings instead of
+    // data formats (as a lot of existing code does)
+    wxDataFormat( const wxString& id ) { InitFromString(id); }
+    wxDataFormat( const char *id ) { InitFromString(id); }
+    wxDataFormat( const wchar_t *id ) { InitFromString(id); }
+    wxDataFormat( const wxCStrData& id ) { InitFromString(id); }
+
+    wxDataFormat& operator=(const wxDataFormat& format)
+    {
+        if (&format != this)
+        {
+            m_type = format.m_type;
+            m_format = format.m_format;
+        }
+        return *this;
+    }

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


@@ -32,6 +46,10 @@ public:
         { return m_format == (NativeFormat)format; }
     bool operator!=(NativeFormat format) const
         { return m_format != (NativeFormat)format; }
         { return m_format == (NativeFormat)format; }
     bool operator!=(NativeFormat format) const
         { return m_format != (NativeFormat)format; }

+    bool operator==(wxDataFormatId format) const
+        { 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
 
     // explicit and implicit conversions to NativeFormat which is one of
     // standard data types (implicit conversion is useful for preserving the


@@ -44,17 +62,20 @@ 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;

+    void SetType( wxDataFormatId type );

 
 private:
 
 private:

+    // common part of ctors from format name
+    void InitFromString(const wxString& id);
+

     wxDataFormatId   m_type;
     NativeFormat     m_format;
 
     void PrepareFormats();
     wxDataFormatId   m_type;
     NativeFormat     m_format;
 
     void PrepareFormats();

-    void SetType( wxDataFormatId type );

 };
 
 #endif // _WX_GTK_DATAFORM_H
 };
 
 #endif // _WX_GTK_DATAFORM_H