more intelligent behaviour of wxHtmlWindow history: does not remember same page sever...

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10806 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/src/html/htmlwin.cpp b/src/html/htmlwin.cpp
index 9db304ff227e1b7d41951b8f0a2b501c2edaa1d9..00c0fb737722a084120d2388daee919a652ef227 100644 (file)
--- a/src/html/htmlwin.cpp
+++ b/src/html/htmlwin.cpp
@@ -306,10 +306,15 @@ bool wxHtmlWindow::LoadPage(const wxString& location)
     {
         int c = m_History->GetCount() - (m_HistoryPos + 1);
 
-        m_HistoryPos++;
-        for (int i = 0; i < c; i++)
-            m_History->Remove(m_HistoryPos);
-        m_History->Add(new wxHtmlHistoryItem(m_OpenedPage, m_OpenedAnchor));
+        if (m_HistoryPos < 0 || 
+            (*m_History)[m_HistoryPos].GetPage() != m_OpenedPage ||
+            (*m_History)[m_HistoryPos].GetAnchor() != m_OpenedAnchor)
+        {
+            m_HistoryPos++;
+            for (int i = 0; i < c; i++)
+                m_History->Remove(m_HistoryPos);
+            m_History->Add(new wxHtmlHistoryItem(m_OpenedPage, m_OpenedAnchor));
+        }
     }
 
     if (m_OpenedPageTitle == wxEmptyString)