X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/5c7b506103cfc078a821860766e31c47d595e07f..07aaf32633ecf18ec3edfbb41793a112914792d0:/src/generic/helpext.cpp

diff --git a/src/generic/helpext.cpp b/src/generic/helpext.cpp
index 64e1695638..d43331fbc6 100644
--- a/src/generic/helpext.cpp
+++ b/src/generic/helpext.cpp
@@ -53,7 +53,7 @@
 // ----------------------------------------------------------------------------
 
 // Name for map file.
-#define WXEXTHELP_MAPFILE                   _T("wxhelp.map")
+#define WXEXTHELP_MAPFILE                   wxT("wxhelp.map")
 
 // Character introducing comments/documentation field in map file.
 #define WXEXTHELP_COMMENTCHAR               ';'
@@ -90,11 +90,13 @@ wxExtHelpController::~wxExtHelpController()
     DeleteList();
 }
 
+#if WXWIN_COMPATIBILITY_2_8
 void wxExtHelpController::SetBrowser(const wxString& browsername, bool isNetscape)
 {
     m_BrowserName = browsername;
     m_BrowserIsNetscape = isNetscape;
 }
+#endif
 
 void wxExtHelpController::SetViewer(const wxString& viewer, long flags)
 {
@@ -105,7 +107,7 @@ void wxExtHelpController::SetViewer(const wxString& viewer, long flags)
 bool wxExtHelpController::DisplayHelp(const wxString &relativeURL)
 {
     // construct hte URL to open -- it's just a file
-    wxString url(_T("file://") + m_helpDir);
+    wxString url(wxT("file://") + m_helpDir);
     url << wxFILE_SEP_PATH << relativeURL;
 
     // use the explicit browser program if specified
@@ -120,7 +122,7 @@ bool wxExtHelpController::DisplayHelp(const wxString &relativeURL)
                 return true;
         }
 
-        if ( wxExecute(m_BrowserName + _T(' ') + url, wxEXEC_SYNC) != -1 )
+        if ( wxExecute(m_BrowserName + wxT(' ') + url, wxEXEC_SYNC) != -1 )
             return true;
     }
     //else: either no browser explicitly specified or we failed to open it
@@ -132,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()
@@ -152,8 +154,7 @@ void wxExtHelpController::DeleteList()
             node = m_MapList->GetFirst();
         }
 
-        delete m_MapList;
-        m_MapList = (wxList*) NULL;
+        wxDELETE(m_MapList);
     }
 }
 
@@ -170,11 +171,11 @@ 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
-    if ( *p == _T('\0') || *p == WXEXTHELP_COMMENTCHAR )
+    if ( *p == wxT('\0') || *p == WXEXTHELP_COMMENTCHAR )
         return true;
 
     // the line is of the form "num url" so we must have an integer now
@@ -185,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
@@ -202,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;
     }
@@ -240,7 +241,7 @@ bool wxExtHelpController::LoadFile(const wxString& file)
         if ( ! dirExists )
         {
             // try without encoding
-            const wxString locNameWithoutEncoding = locName.BeforeLast(_T('.'));
+            const wxString locNameWithoutEncoding = locName.BeforeLast(wxT('.'));
             if ( !locNameWithoutEncoding.empty() )
             {
                 helpDirLoc = helpDir;
@@ -252,7 +253,7 @@ bool wxExtHelpController::LoadFile(const wxString& file)
         if ( !dirExists )
         {
             // try without country part
-            wxString locNameWithoutCountry = locName.BeforeLast(_T('_'));
+            wxString locNameWithoutCountry = locName.BeforeLast(wxT('_'));
             if ( !locNameWithoutCountry.empty() )
             {
                 helpDirLoc = helpDir;
@@ -324,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;
@@ -338,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:
@@ -356,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();
     }