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

diff --git a/src/generic/helpext.cpp b/src/generic/helpext.cpp
index b6e4b63812..63f1b4c4b8 100644
--- a/src/generic/helpext.cpp
+++ b/src/generic/helpext.cpp
@@ -154,8 +154,7 @@ void wxExtHelpController::DeleteList()
             node = m_MapList->GetFirst();
         }
 
-        delete m_MapList;
-        m_MapList = NULL;
+        wxDELETE(m_MapList);
     }
 }
 
@@ -172,7 +171,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 +186,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 +203,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;
     }
@@ -340,7 +339,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: