Remove SetPageTitle and GetPageTitle and make GetCurrentTitle actually return the...

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

diff --git a/include/wx/gtk1/dataform.h b/include/wx/gtk1/dataform.h
index 5d143ed9aaab9a8c36a4b1190dc00b3f52e56fd8..ad27104edd3396988b96d197c88e75db8441c92f 100644 (file)
--- a/include/wx/gtk1/dataform.h
+++ b/include/wx/gtk1/dataform.h
@@ -20,9 +20,16 @@ public:
 
     wxDataFormat();
     wxDataFormat( wxDataFormatId type );
 
     wxDataFormat();
     wxDataFormat( wxDataFormatId type );

-    wxDataFormat( const wxString &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)
         { m_type = format.m_type; m_format = format.m_format; return *this; }
     wxDataFormat& operator=(NativeFormat format)
     wxDataFormat& operator=(const wxDataFormat& format)
         { m_type = format.m_type; m_format = format.m_format; return *this; }
     wxDataFormat& operator=(NativeFormat format)


@@ -56,6 +63,9 @@ public:
     void SetType( wxDataFormatId type );
 
 private:
     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;