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

Replace wxEXPLICIT with the 'explicit' keyword

Browse Source 
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
Download Patch File Download Diff File Expand all files Collapse all files

2
include/wx/gtk/bitmap.h
View File

@@ -82,7 +82,7 @@ public:
wxBitmap(const wxImage& image, int depth = wxBITMAP_SCREEN_DEPTH, double scale = 1.0);
#endif // wxUSE_IMAGE
wxBitmap(GdkPixbuf* pixbuf, int depth = 0);
wxEXPLICIT wxBitmap(const wxCursor& cursor);
explicit wxBitmap(const wxCursor& cursor);
virtual ~wxBitmap();
bool Create(int width, int height, int depth = wxBITMAP_SCREEN_DEPTH) wxOVERRIDE;

2
include/wx/gtk/glcanvas.h
View File

@@ -29,7 +29,7 @@ public:
const wxString& name = wxGLCanvasName,
const wxPalette& palette = wxNullPalette);
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,

4
include/wx/gtk/private/textmeasure.h
View File

@@ -19,13 +19,13 @@ class WXDLLIMPEXP_FWD_CORE wxWindowDCImpl;
class wxTextMeasure : public wxTextMeasureBase
{
public:
wxEXPLICIT wxTextMeasure(const wxDC *dc, const wxFont *font = NULL)
explicit wxTextMeasure(const wxDC *dc, const wxFont *font = NULL)
: wxTextMeasureBase(dc, font)
{
Init();
}
wxEXPLICIT wxTextMeasure(const wxWindow *win, const wxFont *font = NULL)
explicit wxTextMeasure(const wxWindow *win, const wxFont *font = NULL)
: wxTextMeasureBase(win, font)
{
Init();