add ctor overloads for all kinds of strings to fix using strings implicitly as wxData...

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@46308 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/include/wx/msw/ole/dataform.h b/include/wx/msw/ole/dataform.h
index 3b81aef322ed01e71b7a94f645a0981c464c3d4f..7c4bd960a8e5ae1cc54a7af61ff89e6ed3acaa64 100644 (file)
--- a/include/wx/msw/ole/dataform.h
+++ b/include/wx/msw/ole/dataform.h
@@ -23,7 +23,14 @@ public:
     typedef unsigned short NativeFormat;
 
     wxDataFormat(NativeFormat format = wxDF_INVALID) { m_format = format; }
     typedef unsigned short NativeFormat;
 
     wxDataFormat(NativeFormat format = wxDF_INVALID) { m_format = format; }

+
+    // we need constructors from all string types as implicit conversions to
+    // wxString don't apply when we already rely on implicit conversion of a,
+    // for example, "char *" string to wxDataFormat, and existing code does it

     wxDataFormat(const wxString& format) { SetId(format); }
     wxDataFormat(const wxString& format) { SetId(format); }

+    wxDataFormat(const char *format) { SetId(format); }
+    wxDataFormat(const wchar_t *format) { SetId(format); }
+    wxDataFormat(const wxCStrData& format) { SetId(format); }

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