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
This commit is contained in:
parent
de6a9bb6c1
commit
aad2787407
@ -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; }
|
||||
|
Loading…
Reference in New Issue
Block a user