remove tests for bool and {const,static,reinterpret}_cast in configure and wx/defs...

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

diff --git a/include/wx/gtk/dataform.h b/include/wx/gtk/dataform.h
index 3b66e3117a399ce538a0408a7e12023e1a7af83d..86e0cd783804eb16b4c6d63e5e597e2d6dbaa64a 100644 (file)
--- a/include/wx/gtk/dataform.h
+++ b/include/wx/gtk/dataform.h
@@ -20,12 +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)
     wxDataFormat& operator=(const wxDataFormat& format)

-        { m_type = format.m_type; m_format = format.m_format; return *this; }
+    {
+        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; }
 


@@ -50,13 +62,16 @@ 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;
     void SetType( wxDataFormatId type );
 
 private:
 
     // implementation
     wxDataFormatId GetType() const;
     void SetType( wxDataFormatId type );
 
 private:

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

     wxDataFormatId   m_type;
     NativeFormat     m_format;
 
     wxDataFormatId   m_type;
     NativeFormat     m_format;