From aad2787407e3c610a2604f782ad0c3b05abf7336 Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Sun, 3 Jun 2007 22:03:43 +0000 Subject: [PATCH] add ctor overloads for all kinds of strings to fix using strings implicitly as wxDataFormat objects after the last change git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@46308 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- include/wx/msw/ole/dataform.h | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/include/wx/msw/ole/dataform.h b/include/wx/msw/ole/dataform.h index 3b81aef322..7c4bd960a8 100644 --- 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; } + + // 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 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; } -- 2.45.2