X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/af49c4b8a2d3553e733e71c7dd3911881f4c1a2a..ef094fa075bc56bcbc33b12159c395ea28afda3b:/include/wx/generic/panelg.h diff --git a/include/wx/generic/panelg.h b/include/wx/generic/panelg.h index b7f14c0af2..b6bc8cb2a4 100644 --- a/include/wx/generic/panelg.h +++ b/include/wx/generic/panelg.h @@ -50,7 +50,7 @@ public: // Constructor wxPanel(wxWindow *parent, - wxWindowID id = -1, + wxWindowID winid = -1, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = wxTAB_TRAVERSAL | wxNO_BORDER, @@ -58,11 +58,11 @@ public: { Init(); - Create(parent, id, pos, size, style, name); + Create(parent, winid, pos, size, style, name); } // Pseudo ctor - bool Create(wxWindow *parent, wxWindowID id, + bool Create(wxWindow *parent, wxWindowID winid, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = wxTAB_TRAVERSAL | wxNO_BORDER, @@ -82,8 +82,8 @@ public: virtual void InitDialog(); #ifdef __WXUNIVERSAL__ - virtual bool IsCanvasWindow() { return TRUE; } - virtual bool ProvidesBackground() { return TRUE; } + virtual bool IsCanvasWindow() const { return TRUE; } + virtual bool ProvidesBackground() const { return TRUE; } #endif WX_DECLARE_CONTROL_CONTAINER();