Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Make wxImage ctor from XPM data explicit

Browse Source 
This avoids accidental conversions from XPM to wxImage which can result
in the use of an expected wxBitmap ctor later.

See #19149.
This commit is contained in:
Vadim Zeitlin
2021-04-17 11:54:32 +01:00
parent 72500faf7c
commit 5e53f74af1
2 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/wx/image.h
View File

@@ -310,7 +310,7 @@ public:
{ LoadFile( name, type, index ); } { LoadFile( name, type, index ); }
wxImage( const wxString& name, const wxString& mimetype, int index = -1 ) wxImage( const wxString& name, const wxString& mimetype, int index = -1 )
{ LoadFile( name, mimetype, index ); } { LoadFile( name, mimetype, index ); }
wxImage( const char* const* xpmData ) explicit wxImage( const char* const* xpmData )
{ Create(xpmData); } { Create(xpmData); }
#if wxUSE_STREAMS #if wxUSE_STREAMS

4
interface/wx/image.h
View File

@@ -611,8 +611,10 @@ public:
@beginWxPerlOnly @beginWxPerlOnly
Not supported by wxPerl. Not supported by wxPerl.
@endWxPerlOnly @endWxPerlOnly
This constructor has become @c explicit in wxWidgets 3.1.6.
*/ */
wxImage(const char* const* xpmData); explicit wxImage(const char* const* xpmData);
/** /**
Creates an image from a file. Creates an image from a file.