From b9974b8417976075890f28b31be199da04f94341 Mon Sep 17 00:00:00 2001
From: David Elliott <dfe@tgwbd.org>
Date: Mon, 16 Aug 2004 02:35:25 +0000
Subject: [PATCH] Use variable name winid instead of id. id is a typedef in
Objective-C headers.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@28804 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---
include/wx/cocoa/button.h | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/include/wx/cocoa/button.h b/include/wx/cocoa/button.h
index a33f669a1c..b0ecb12f7a 100644
--- a/include/wx/cocoa/button.h
+++ b/include/wx/cocoa/button.h
@@ -37,14 +37,14 @@ public:
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 wxPoint& pos = wxDefaultPosition,
long style = 0,
const wxValidator& validator = wxDefaultValidator,
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,
@@ -54,14 +54,14 @@ public:
const wxValidator& validator = wxDefaultValidator,
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 wxPoint& pos = wxDefaultPosition,
long style = 0,
const wxValidator& validator = wxDefaultValidator,
const wxString& name = wxButtonNameStr)
{
- return CreateStock(parent, id, stock, descriptiveLabel,
+ return CreateStock(parent, winid, stock, descriptiveLabel,
pos, style, validator, name);
}
--
2.47.2