X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/6636ef8ddf9eda0d0352c29d98cb141676a51a2d..293656292f058603a996b136eee9c7fefc6d3350:/src/generic/helpext.cpp diff --git a/src/generic/helpext.cpp b/src/generic/helpext.cpp index 63f1b4c4b8..d43331fbc6 100644 --- a/src/generic/helpext.cpp +++ b/src/generic/helpext.cpp @@ -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(); }