Rework the GTK WebKit backend history to remove the need for the map between wxWebHis...

[wxWidgets.git] / src / gtk / webview_webkit.cpp

diff --git a/src/gtk/webview_webkit.cpp b/src/gtk/webview_webkit.cpp
index c1493d21e6b1c51cc0490f8f07c1d438c23240a4..fcdd060b2e8201ed8cf0085b50b403585978701d 100644 (file)
--- a/src/gtk/webview_webkit.cpp
+++ b/src/gtk/webview_webkit.cpp
@@ -469,11 +469,12 @@ wxVector<wxSharedPtr<wxWebHistoryItem> > wxWebViewWebKit::GetBackwardHistory()
     for(int i = g_list_length(list) - 1; i >= 0 ; i--)
     {
         WebKitWebHistoryItem* gtkitem = (WebKitWebHistoryItem*)g_list_nth_data(list, i);
     for(int i = g_list_length(list) - 1; i >= 0 ; i--)
     {
         WebKitWebHistoryItem* gtkitem = (WebKitWebHistoryItem*)g_list_nth_data(list, i);

-        wxSharedPtr<wxWebHistoryItem> item(new wxWebHistoryItem(
-                                           webkit_web_history_item_get_uri(gtkitem),
-                                           webkit_web_history_item_get_title(gtkitem)));
+        wxWebHistoryItem* wxitem = new wxWebHistoryItem(
+                                   webkit_web_history_item_get_uri(gtkitem),
+                                   webkit_web_history_item_get_title(gtkitem));
+        wxitem->m_histItem = gtkitem;
+        wxSharedPtr<wxWebHistoryItem> item(wxitem);

         backhist.push_back(item);
         backhist.push_back(item);

-        m_historyMap[item] = gtkitem;

     }
     return backhist;
 }
     }
     return backhist;
 }


@@ -488,23 +489,25 @@ wxVector<wxSharedPtr<wxWebHistoryItem> > wxWebViewWebKit::GetForwardHistory()
     for(guint i = 0; i < g_list_length(list); i++)
     {
         WebKitWebHistoryItem* gtkitem = (WebKitWebHistoryItem*)g_list_nth_data(list, i);
     for(guint i = 0; i < g_list_length(list); i++)
     {
         WebKitWebHistoryItem* gtkitem = (WebKitWebHistoryItem*)g_list_nth_data(list, i);

-        wxSharedPtr<wxWebHistoryItem> item(new wxWebHistoryItem(
-                                           webkit_web_history_item_get_uri(gtkitem),
-                                           webkit_web_history_item_get_title(gtkitem)));
+        wxWebHistoryItem* wxitem = new wxWebHistoryItem(
+                                   webkit_web_history_item_get_uri(gtkitem),
+                                   webkit_web_history_item_get_title(gtkitem));
+        wxitem->m_histItem = gtkitem;
+        wxSharedPtr<wxWebHistoryItem> item(wxitem);

         forwardhist.push_back(item);
         forwardhist.push_back(item);

-        m_historyMap[item] = gtkitem;

     }
     return forwardhist;
 }
 
 void wxWebViewWebKit::LoadHistoryItem(wxSharedPtr<wxWebHistoryItem> item)
 {
     }
     return forwardhist;
 }
 
 void wxWebViewWebKit::LoadHistoryItem(wxSharedPtr<wxWebHistoryItem> item)
 {

-    WebKitWebHistoryItem* gtkitem = m_historyMap[item];
+    WebKitWebHistoryItem* gtkitem = item->m_histItem;

     if(gtkitem)
     {
         WebKitWebBackForwardList* history;
         history = webkit_web_view_get_back_forward_list(WEBKIT_WEB_VIEW(web_view));
     if(gtkitem)
     {
         WebKitWebBackForwardList* history;
         history = webkit_web_view_get_back_forward_list(WEBKIT_WEB_VIEW(web_view));

-        webkit_web_back_forward_list_go_to_item(history, gtkitem);
+        webkit_web_back_forward_list_go_to_item(WEBKIT_WEB_BACK_FORWARD_LIST(history), 
+                                                WEBKIT_WEB_HISTORY_ITEM(gtkitem));

     }
 }
 
     }
 }