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

replace usage of objective-c keyword 'id'

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67214 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Stefan Csomor
2011-03-16 07:22:56 +00:00
parent 4b1d0dbe25
commit 6485c8d7fb
3 changed files with 27 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/generic/helpext.cpp
View File

@@ -134,12 +134,12 @@ bool wxExtHelpController::DisplayHelp(const wxString &relativeURL)
class wxExtHelpMapEntry : public wxObject
{
public:
int id;
int entryid;
wxString url;
wxString doc;
wxExtHelpMapEntry(int iid, wxString const &iurl, wxString const &idoc)
{ id = iid; url = iurl; doc = idoc; }
{ entryid = iid; url = iurl; doc = idoc; }
};
void wxExtHelpController::DeleteList()
@@ -325,7 +325,7 @@ bool wxExtHelpController::DisplayContents()
while (node)
{
entry = (wxExtHelpMapEntry *)node->GetData();
if (entry->id == WXEXTHELP_CONTENTS_ID)
if (entry->entryid == WXEXTHELP_CONTENTS_ID)
{
contents = entry->url;
break;
@@ -357,7 +357,7 @@ bool wxExtHelpController::DisplaySection(int sectionNo)
while (node)
{
entry = (wxExtHelpMapEntry *)node->GetData();
if (entry->id == sectionNo)
if (entry->entryid == sectionNo)
return DisplayHelp(entry->url);
node = node->GetNext();
}