Don't name variables "id" in public headers.

This name clashes with Objective-C reserved keyword and so prevents the
headers using it from being included from Objective-C++ code.

Closes #12832.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66546 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2011-01-03 18:43:30 +00:00
parent 58ce18f2fd
commit fb1e645577
2 changed files with 29 additions and 29 deletions

View File

@@ -95,7 +95,7 @@ public:
void SetItemRect(const wxRect& r) { rect = r; }
int GetToolId() const { return tool_id; }
void SetToolId(int id) { tool_id = id; }
void SetToolId(int toolid) { tool_id = toolid; }
private:
@@ -120,7 +120,7 @@ public:
window = NULL;
sizer_item = NULL;
spacer_pixels = 0;
id = 0;
toolid = 0;
kind = wxITEM_NORMAL;
state = 0; // normal, enabled
proportion = 0;
@@ -154,7 +154,7 @@ public:
sizer_item = c.sizer_item;
min_size = c.min_size;
spacer_pixels = c.spacer_pixels;
id = c.id;
toolid = c.toolid;
kind = c.kind;
state = c.state;
proportion = c.proportion;
@@ -169,8 +169,8 @@ public:
void SetWindow(wxWindow* w) { window = w; }
wxWindow* GetWindow() { return window; }
void SetId(int new_id) { id = new_id; }
int GetId() const { return id; }
void SetId(int new_id) { toolid = new_id; }
int GetId() const { return toolid; }
void SetKind(int new_kind) { kind = new_kind; }
int GetKind() const { return kind; }
@@ -235,7 +235,7 @@ private:
wxSizerItem* sizer_item; // sizer item
wxSize min_size; // item's minimum size
int spacer_pixels; // size of a spacer
int id; // item's id
int toolid; // item's id
int kind; // item's kind
int state; // state
int proportion; // proportion