AuroraMiddleware/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Apply implicit encoding check to wxDataFormat ctor in wxMSW too

Browse Source 
This is similar to what had been already done in wxGTK.
This commit is contained in:
Vadim Zeitlin 2020-03-23 15:53:30 +01:00
parent a2609429a3
commit f44121378e
1 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/wx/msw/ole/dataform.h
View File

@ -27,7 +27,9 @@ public:
// wxString don't apply when we already rely on implicit conversion of a, // wxString don't apply when we already rely on implicit conversion of a,
// for example, "char *" string to wxDataFormat, and existing code does it // for example, "char *" string to wxDataFormat, and existing code does it
wxDataFormat(const wxString& format) { SetId(format); } wxDataFormat(const wxString& format) { SetId(format); }
#ifndef wxNO_IMPLICIT_WXSTRING_ENCODING
wxDataFormat(const char *format) { SetId(format); } wxDataFormat(const char *format) { SetId(format); }
#endif // wxNO_IMPLICIT_WXSTRING_ENCODING
wxDataFormat(const wchar_t *format) { SetId(format); } wxDataFormat(const wchar_t *format) { SetId(format); }
wxDataFormat(const wxCStrData& format) { SetId(format); } wxDataFormat(const wxCStrData& format) { SetId(format); }