Handle Shift-TAB correctly in wxOSX/Carbon wxComboBox.

[wxWidgets.git] / src / generic / helpext.cpp

diff --git a/src/generic/helpext.cpp b/src/generic/helpext.cpp
index 4f1f2543c4bc47f588aecb14966bec78a12a77cc..d43331fbc6f1d570617fd6b35e056d24bcdc5f60 100644 (file)
--- 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()
@@ -154,8 +154,7 @@ void wxExtHelpController::DeleteList()
             node = m_MapList->GetFirst();
         }
 
-        delete m_MapList;
-        m_MapList = NULL;
+        wxDELETE(m_MapList);
     }
 }
 
@@ -326,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;
@@ -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:
@@ -358,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();
     }