made ShouldPreventAppExit() public

[wxWidgets.git] / src / html / helpwnd.cpp

diff --git a/src/html/helpwnd.cpp b/src/html/helpwnd.cpp
index 83c06c71c6c592f4b0cddfe6614ead29f25ad2dd..e9aac75806a72bfd8c99f19d1c1fa27eb72d7304 100644 (file)
--- a/src/html/helpwnd.cpp
+++ b/src/html/helpwnd.cpp
@@ -1503,7 +1503,9 @@ void wxHtmlHelpWindow::OnToolbar(wxCommandEvent& event)
                 {
                     m_BookmarksNames.RemoveAt(pos);
                     m_BookmarksPages.RemoveAt(pos);
-                    m_Bookmarks->Delete(m_Bookmarks->GetSelection());
+                    pos = m_Bookmarks->GetSelection();
+                    wxASSERT_MSG( pos != wxNOT_FOUND , wxT("Unknown bookmark position") ) ;
+                    m_Bookmarks->Delete((unsigned int)pos);
                 }
             }
             break;
@@ -1718,11 +1720,11 @@ void wxHtmlHelpWindow::OnSearch(wxCommandEvent& WXUNUSED(event))
 
 void wxHtmlHelpWindow::OnBookmarksSel(wxCommandEvent& WXUNUSED(event))
 {
-    wxString sr = m_Bookmarks->GetStringSelection();
-
-    if (sr != wxEmptyString && sr != _("(bookmarks)"))
+    wxString str = m_Bookmarks->GetStringSelection();
+    int idx = m_BookmarksNames.Index(str);
+    if (!str.empty() && str != _("(bookmarks)") && idx != wxNOT_FOUND)
     {
-       m_HtmlWin->LoadPage(m_BookmarksPages[m_BookmarksNames.Index(sr)]);
+       m_HtmlWin->LoadPage(m_BookmarksPages[(size_t)idx]);
        NotifyPageChanged();
     }
 }