Replace wxEXPLICIT with the 'explicit' keyword

See #17655.
This commit is contained in:
ARATA Mizuki
2016-08-30 17:44:32 +09:00
parent 1e6251d592
commit 8cfc74491a
46 changed files with 73 additions and 99 deletions

View File

@@ -32,7 +32,7 @@ public:
// Convert from wxIcon / wxCursor
wxBitmap(const wxIcon& icon) { CopyFromIcon(icon); }
wxEXPLICIT wxBitmap(const wxCursor& cursor);
explicit wxBitmap(const wxCursor& cursor);
static void InitStandardHandlers();

View File

@@ -31,7 +31,7 @@ private:
class WXDLLIMPEXP_GL wxGLCanvas : public wxGLCanvasBase
{
public:
wxEXPLICIT // avoid implicitly converting a wxWindow* to wxGLCanvas
explicit // avoid implicitly converting a wxWindow* to wxGLCanvas
wxGLCanvas(wxWindow *parent,
wxWindowID id = wxID_ANY,
const int *attribList = NULL,