X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/9a83f860948059b0273b5cc6d9e43fadad3ebfca..c7ea5a0c7edbdb777640e2613bfaac5f649b3340:/src/generic/helpext.cpp?ds=sidebyside

diff --git a/src/generic/helpext.cpp b/src/generic/helpext.cpp
index b6e4b63812..af4644ad85 100644
--- a/src/generic/helpext.cpp
+++ b/src/generic/helpext.cpp
@@ -4,7 +4,6 @@
 // Author:      Karsten Ballueder
 // Modified by:
 // Created:     04/01/98
-// RCS-ID:      $Id$
 // Copyright:   (c) Karsten Ballueder
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -134,12 +133,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()
@@ -154,8 +153,7 @@ void wxExtHelpController::DeleteList()
             node = m_MapList->GetFirst();
         }
 
-        delete m_MapList;
-        m_MapList = NULL;
+        wxDELETE(m_MapList);
     }
 }
 
@@ -172,7 +170,7 @@ bool wxExtHelpController::ParseMapFileLine(const wxString& line)
     const wxChar *p = line.c_str();
 
     // skip whitespace
-    while ( isascii(*p) && isspace(*p) )
+    while ( isascii(*p) && wxIsspace(*p) )
         p++;
 
     // skip empty lines and comments
@@ -187,16 +185,16 @@ bool wxExtHelpController::ParseMapFileLine(const wxString& line)
         return false;
 
     p = end;
-    while ( isascii(*p) && isspace(*p) )
+    while ( isascii(*p) && wxIsspace(*p) )
         p++;
 
     // next should be the URL
     wxString url;
     url.reserve(line.length());
-    while ( isascii(*p) && !isspace(*p) )
+    while ( isascii(*p) && !wxIsspace(*p) )
         url += *p++;
 
-    while ( isascii(*p) && isspace(*p) )
+    while ( isascii(*p) && wxIsspace(*p) )
         p++;
 
     // and finally the optional description of the entry after comment
@@ -204,7 +202,7 @@ bool wxExtHelpController::ParseMapFileLine(const wxString& line)
     if ( *p == WXEXTHELP_COMMENTCHAR )
     {
         p++;
-        while ( isascii(*p) && isspace(*p) )
+        while ( isascii(*p) && wxIsspace(*p) )
             p++;
         doc = p;
     }
@@ -326,7 +324,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;
@@ -340,7 +338,7 @@ bool wxExtHelpController::DisplayContents()
     file << m_helpDir << wxFILE_SEP_PATH << contents;
     if (file.Contains(wxT('#')))
         file = file.BeforeLast(wxT('#'));
-    if (contents.length() && wxFileExists(file))
+    if ( wxFileExists(file) )
         rc = DisplaySection(WXEXTHELP_CONTENTS_ID);
 
     // if not found, open homemade toc:
@@ -358,7 +356,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();
     }