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

Use variable name winid instead of id. id is a typedef in Objective-C headers.

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@28804 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
David Elliott
2004-08-16 02:35:25 +00:00
parent 72b1ad5c2e
commit b9974b8417
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
include/wx/cocoa/button.h
View File

@@ -37,14 +37,14 @@ public:
Create(parent, winid, label, pos, size, style, validator, name); Create(parent, winid, label, pos, size, style, validator, name);
} }
wxButton(wxWindow *parent, wxWindowID id, wxStockItemID stock, wxButton(wxWindow *parent, wxWindowID winid, wxStockItemID stock,
const wxString& descriptiveLabel = wxEmptyString, const wxString& descriptiveLabel = wxEmptyString,
const wxPoint& pos = wxDefaultPosition, const wxPoint& pos = wxDefaultPosition,
long style = 0, long style = 0,
const wxValidator& validator = wxDefaultValidator, const wxValidator& validator = wxDefaultValidator,
const wxString& name = wxButtonNameStr) const wxString& name = wxButtonNameStr)
{ {
Create(parent, id, stock, descriptiveLabel, pos, style, validator, name); Create(parent, winid, stock, descriptiveLabel, pos, style, validator, name);
} }
bool Create(wxWindow *parent, wxWindowID winid, bool Create(wxWindow *parent, wxWindowID winid,
@@ -54,14 +54,14 @@ public:
const wxValidator& validator = wxDefaultValidator, const wxValidator& validator = wxDefaultValidator,
const wxString& name = wxButtonNameStr); const wxString& name = wxButtonNameStr);
bool Create(wxWindow *parent, wxWindowID id, wxStockItemID stock, bool Create(wxWindow *parent, wxWindowID winid, wxStockItemID stock,
const wxString& descriptiveLabel = wxEmptyString, const wxString& descriptiveLabel = wxEmptyString,
const wxPoint& pos = wxDefaultPosition, const wxPoint& pos = wxDefaultPosition,
long style = 0, long style = 0,
const wxValidator& validator = wxDefaultValidator, const wxValidator& validator = wxDefaultValidator,
const wxString& name = wxButtonNameStr) const wxString& name = wxButtonNameStr)
{ {
return CreateStock(parent, id, stock, descriptiveLabel, return CreateStock(parent, winid, stock, descriptiveLabel,
pos, style, validator, name); pos, style, validator, name);
} }