STL compilation fix.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22319 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/src/generic/helpext.cpp b/src/generic/helpext.cpp
index f0c5bf332dd7ae54e5c728dd9223c23ec8a3e1ec..04e168a39aec8fbc2331b7b24a16b9d095fec936 100644 (file)
--- a/src/generic/helpext.cpp
+++ b/src/generic/helpext.cpp
@@ -198,11 +198,11 @@ void wxExtHelpController::DeleteList()
 {
    if(m_MapList)
    {
 {
    if(m_MapList)
    {

-      wxNode *node = m_MapList->GetFirst();
+      wxList::compatibility_iterator node = m_MapList->GetFirst();

       while (node)
       {
          delete (wxExtHelpMapEntry *)node->GetData();
       while (node)
       {
          delete (wxExtHelpMapEntry *)node->GetData();

-         delete node;
+         m_MapList->Erase(node);

          node = m_MapList->GetFirst();
       }
       delete m_MapList;
          node = m_MapList->GetFirst();
       }
       delete m_MapList;


@@ -328,7 +328,7 @@ wxExtHelpController::DisplayContents()
       return FALSE;
 
    wxString contents;
       return FALSE;
 
    wxString contents;

-   wxNode *node = m_MapList->GetFirst();
+   wxList::compatibility_iterator node = m_MapList->GetFirst();

    wxExtHelpMapEntry *entry;
    while(node)
    {
    wxExtHelpMapEntry *entry;
    while(node)
    {


@@ -360,7 +360,7 @@ wxExtHelpController::DisplaySection(int sectionNo)
       return FALSE;
 
    wxBusyCursor b; // display a busy cursor
       return FALSE;
 
    wxBusyCursor b; // display a busy cursor

-   wxNode *node = m_MapList->GetFirst();
+   wxList::compatibility_iterator node = m_MapList->GetFirst();

    wxExtHelpMapEntry *entry;
    while(node)
    {
    wxExtHelpMapEntry *entry;
    while(node)
    {


@@ -401,7 +401,7 @@ wxExtHelpController::KeywordSearch(const wxString& k)
    int          idx = 0, j;
    bool         rc;
    bool         showAll = k.IsEmpty();
    int          idx = 0, j;
    bool         rc;
    bool         showAll = k.IsEmpty();

-   wxNode       *node = m_MapList->GetFirst();
+   wxList::compatibility_iterator node = m_MapList->GetFirst();

    wxExtHelpMapEntry *entry;
 
    {
    wxExtHelpMapEntry *entry;
 
    {