fixing 'id' objc.h collisions

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38829 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Stefan Csomor 2006-04-19 06:39:43 +00:00
parent a8fb9edee4
commit 7af76fc14e

View File

@ -21,16 +21,16 @@ class WXDLLEXPORT wxControl : public wxControlBase
public:
wxControl();
wxControl(wxWindow *parent, wxWindowID id,
wxControl(wxWindow *parent, wxWindowID winid,
const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize, long style = 0,
const wxValidator& validator = wxDefaultValidator,
const wxString& name = wxControlNameStr)
{
Create(parent, id, pos, size, style, validator, name);
Create(parent, winid, pos, size, style, validator, name);
}
bool Create(wxWindow *parent, wxWindowID id,
bool Create(wxWindow *parent, wxWindowID winid,
const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize, long style = 0,
const wxValidator& validator = wxDefaultValidator,