Rename wxWebHistoryItem to wxWebViewHistoryItem.

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

diff --git a/include/wx/gtk/webhistoryitem_webkit.h b/include/wx/gtk/webhistoryitem_webkit.h
deleted file mode 100644 (file)
index 444d0f4..0000000
--- a/include/wx/gtk/webhistoryitem_webkit.h
+++ /dev/null
@@ -1,36 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        include/wx/gtk/webhistoryitem.h
-// Purpose:     wxWebHistoryItem header for GTK
-// Author:      Steven Lamerton
-// Id:          $Id$
-// Copyright:   (c) 2011 Steven Lamerton
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_GTK_WEBHISTORYITEM_H_
-#define _WX_GTK_WEBHISTORYITEM_H_
-
-#include "wx/setup.h"
-
-#if wxUSE_WEBVIEW_WEBKIT && defined(__WXGTK__)
-
-#include "webkit/webkit.h"
-
-class WXDLLIMPEXP_WEB wxWebHistoryItem
-{
-public:
-    wxWebHistoryItem(const wxString& url, const wxString& title) : 
-                     m_url(url), m_title(title) {}
-    wxString GetUrl() { return m_url; }
-    wxString GetTitle() { return m_title; }
-
-    friend class wxWebViewWebKit;
-
-private:
-    wxString m_url, m_title;
-    WebKitWebHistoryItem* m_histItem;
-};
-
-#endif // wxUSE_WEBVIEW_WEBKIT && defined(__WXGTK__)
-
-#endif // _WX_GTK_WEBHISTORYITEM_H_

diff --git a/include/wx/gtk/webview_webkit.h b/include/wx/gtk/webview_webkit.h
index 72fc0259f23cb207d895ea95f8f2ba8e485ad3e6..c5a8ea616bb5e58cb0e50eada80f97a158ed62cc 100644 (file)
--- a/include/wx/gtk/webview_webkit.h
+++ b/include/wx/gtk/webview_webkit.h
@@ -74,9 +74,9 @@ public:
     virtual bool CanGoForward();
     virtual void ClearHistory();
     virtual void EnableHistory(bool enable = true);
     virtual bool CanGoForward();
     virtual void ClearHistory();
     virtual void EnableHistory(bool enable = true);

-    virtual wxVector<wxSharedPtr<wxWebHistoryItem> > GetBackwardHistory();
-    virtual wxVector<wxSharedPtr<wxWebHistoryItem> > GetForwardHistory();
-    virtual void LoadHistoryItem(wxSharedPtr<wxWebHistoryItem> item);
+    virtual wxVector<wxSharedPtr<wxWebViewHistoryItem> > GetBackwardHistory();
+    virtual wxVector<wxSharedPtr<wxWebViewHistoryItem> > GetForwardHistory();
+    virtual void LoadHistoryItem(wxSharedPtr<wxWebViewHistoryItem> item);

     virtual wxString GetCurrentURL();
     virtual wxString GetCurrentTitle();
     virtual wxString GetPageSource();
     virtual wxString GetCurrentURL();
     virtual wxString GetCurrentTitle();
     virtual wxString GetPageSource();

diff --git a/include/wx/gtk/webviewhistoryitem_webkit.h b/include/wx/gtk/webviewhistoryitem_webkit.h
new file mode 100644 (file)
index 0000000..3f96d61
--- /dev/null
+++ b/include/wx/gtk/webviewhistoryitem_webkit.h
@@ -0,0 +1,36 @@
+/////////////////////////////////////////////////////////////////////////////
+// Name:        include/wx/gtk/webviewhistoryitem.h
+// Purpose:     wxWebViewHistoryItem header for GTK
+// Author:      Steven Lamerton
+// Id:          $Id$
+// Copyright:   (c) 2011 Steven Lamerton
+// Licence:     wxWindows licence
+/////////////////////////////////////////////////////////////////////////////
+
+#ifndef _WX_GTK_WEBVIEWHISTORYITEM_H_
+#define _WX_GTK_WEBVIEWHISTORYITEM_H_
+
+#include "wx/setup.h"
+
+#if wxUSE_WEBVIEW_WEBKIT && defined(__WXGTK__)
+
+#include "webkit/webkit.h"
+
+class WXDLLIMPEXP_WEB wxWebViewHistoryItem
+{
+public:
+    wxWebViewHistoryItem(const wxString& url, const wxString& title) : 
+                     m_url(url), m_title(title) {}
+    wxString GetUrl() { return m_url; }
+    wxString GetTitle() { return m_title; }
+
+    friend class wxWebViewWebKit;
+
+private:
+    wxString m_url, m_title;
+    WebKitWebHistoryItem* m_histItem;
+};
+
+#endif // wxUSE_WEBVIEW_WEBKIT && defined(__WXGTK__)
+
+#endif // _WX_GTK_WEBVIEWHISTORYITEM_H_

diff --git a/include/wx/msw/webhistoryitem_ie.h b/include/wx/msw/webhistoryitem_ie.h
deleted file mode 100644 (file)
index 004eb09..0000000
--- a/include/wx/msw/webhistoryitem_ie.h
+++ /dev/null
@@ -1,31 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        include/wx/msw/webhistoryitem.h
-// Purpose:     wxWebHistoryItem header for MSW
-// Author:      Steven Lamerton
-// Id:          $Id$
-// Copyright:   (c) 2011 Steven Lamerton
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_MSW_WEBHISTORYITEM_H_
-#define _WX_MSW_WEBHISTORYITEM_H_
-
-#include "wx/setup.h"
-
-#if wxUSE_WEBVIEW_IE && defined(__WXMSW__)
-
-class WXDLLIMPEXP_WEB wxWebHistoryItem
-{
-public:
-    wxWebHistoryItem(const wxString& url, const wxString& title) : 
-                     m_url(url), m_title(title) {}
-    wxString GetUrl() { return m_url; }
-    wxString GetTitle() { return m_title; }
-
-private:
-    wxString m_url, m_title;
-};
-
-#endif // wxUSE_WEBVIEW_IE && defined(__WXMSW__)
-
-#endif // _WX_MSW_WEBHISTORYITEM_H_

diff --git a/include/wx/msw/webview_ie.h b/include/wx/msw/webview_ie.h
index 1ab66d5de3f7397f02ed738050f8e68a259317f9..0cec911b2f91242607ea6d73ffea9602826f69c0 100644 (file)
--- a/include/wx/msw/webview_ie.h
+++ b/include/wx/msw/webview_ie.h
@@ -50,9 +50,9 @@ public:
            const wxString& name = wxWebViewNameStr);
 
     virtual void LoadUrl(const wxString& url);
            const wxString& name = wxWebViewNameStr);
 
     virtual void LoadUrl(const wxString& url);

-    virtual void LoadHistoryItem(wxSharedPtr<wxWebHistoryItem> item);
-    virtual wxVector<wxSharedPtr<wxWebHistoryItem> > GetBackwardHistory();
-    virtual wxVector<wxSharedPtr<wxWebHistoryItem> > GetForwardHistory();
+    virtual void LoadHistoryItem(wxSharedPtr<wxWebViewHistoryItem> item);
+    virtual wxVector<wxSharedPtr<wxWebViewHistoryItem> > GetBackwardHistory();
+    virtual wxVector<wxSharedPtr<wxWebViewHistoryItem> > GetForwardHistory();

 
     virtual bool CanGoForward();
     virtual bool CanGoBack();
 
     virtual bool CanGoForward();
     virtual bool CanGoBack();


@@ -147,7 +147,7 @@ private:
     //which are added as documentcomplete events arrive, unless we are loading
     //an item from the history. The position is stored as an int, and reflects
     //where we are in the history list.
     //which are added as documentcomplete events arrive, unless we are loading
     //an item from the history. The position is stored as an int, and reflects
     //where we are in the history list.

-    wxVector<wxSharedPtr<wxWebHistoryItem> > m_historyList;
+    wxVector<wxSharedPtr<wxWebViewHistoryItem> > m_historyList;

     int m_historyPosition;
     bool m_historyLoadingFromList;
     bool m_historyEnabled;
     int m_historyPosition;
     bool m_historyLoadingFromList;
     bool m_historyEnabled;

diff --git a/include/wx/msw/webviewhistoryitem_ie.h b/include/wx/msw/webviewhistoryitem_ie.h
new file mode 100644 (file)
index 0000000..29f94ce
--- /dev/null
+++ b/include/wx/msw/webviewhistoryitem_ie.h
@@ -0,0 +1,31 @@
+/////////////////////////////////////////////////////////////////////////////
+// Name:        include/wx/msw/webviewhistoryitem.h
+// Purpose:     wxWebViewHistoryItem header for MSW
+// Author:      Steven Lamerton
+// Id:          $Id$
+// Copyright:   (c) 2011 Steven Lamerton
+// Licence:     wxWindows licence
+/////////////////////////////////////////////////////////////////////////////
+
+#ifndef _WX_MSW_WEBVIEWHISTORYITEM_H_
+#define _WX_MSW_WEBVIEWHISTORYITEM_H_
+
+#include "wx/setup.h"
+
+#if wxUSE_WEBVIEW_IE && defined(__WXMSW__)
+
+class WXDLLIMPEXP_WEB wxWebViewHistoryItem
+{
+public:
+    wxWebViewHistoryItem(const wxString& url, const wxString& title) : 
+                     m_url(url), m_title(title) {}
+    wxString GetUrl() { return m_url; }
+    wxString GetTitle() { return m_title; }
+
+private:
+    wxString m_url, m_title;
+};
+
+#endif // wxUSE_WEBVIEW_IE && defined(__WXMSW__)
+
+#endif // _WX_MSW_WEBVIEWHISTORYITEM_H_

diff --git a/include/wx/osx/webhistoryitem_webkit.h b/include/wx/osx/webhistoryitem_webkit.h
deleted file mode 100644 (file)
index e3b7a50..0000000
--- a/include/wx/osx/webhistoryitem_webkit.h
+++ /dev/null
@@ -1,35 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        include/wx/osx/webhistoryitem.h
-// Purpose:     wxWebHistoryItem header for OSX
-// Author:      Steven Lamerton
-// Id:          $Id$
-// Copyright:   (c) 2011 Steven Lamerton
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_OSX_WEBHISTORYITEM_H_
-#define _WX_OSX_WEBHISTORYITEM_H_
-
-#include "wx/setup.h"
-
-#if wxUSE_WEBVIEW_WEBKIT && (defined(__WXOSX_COCOA__) \
-                         ||  defined(__WXOSX_CARBON__))
-
-class WXDLLIMPEXP_WEB wxWebHistoryItem
-{
-public:
-    wxWebHistoryItem(const wxString& url, const wxString& title) :
-                     m_url(url), m_title(title) {}
-    wxString GetUrl() { return m_url; }
-    wxString GetTitle() { return m_title; }
-
-    friend class wxWebViewWebKit;
-
-private:
-    wxString m_url, m_title;
-    struct objc_object *m_histItem;
-};
-
-#endif // wxUSE_WEBVIEW_WEBKIT && defined(__WXOSX_MAC__)
-
-#endif // _WX_OSX_WEBHISTORYITEM_H_

diff --git a/include/wx/osx/webview_webkit.h b/include/wx/osx/webview_webkit.h
index da88edfb6b88f9abb20450b56e7f80c7ac079fa9..ecdd7a808b756707ce32e076eae88d2aebb18666 100644 (file)
--- a/include/wx/osx/webview_webkit.h
+++ b/include/wx/osx/webview_webkit.h
@@ -81,9 +81,9 @@ public:
     //History functions
     virtual void ClearHistory();
     virtual void EnableHistory(bool enable = true);
     //History functions
     virtual void ClearHistory();
     virtual void EnableHistory(bool enable = true);

-    virtual wxVector<wxSharedPtr<wxWebHistoryItem> > GetBackwardHistory();
-    virtual wxVector<wxSharedPtr<wxWebHistoryItem> > GetForwardHistory();
-    virtual void LoadHistoryItem(wxSharedPtr<wxWebHistoryItem> item);
+    virtual wxVector<wxSharedPtr<wxWebViewHistoryItem> > GetBackwardHistory();
+    virtual wxVector<wxSharedPtr<wxWebViewHistoryItem> > GetForwardHistory();
+    virtual void LoadHistoryItem(wxSharedPtr<wxWebViewHistoryItem> item);

     
     //Undo / redo functionality
     virtual bool CanUndo();
     
     //Undo / redo functionality
     virtual bool CanUndo();

diff --git a/include/wx/osx/webviewhistoryitem_webkit.h b/include/wx/osx/webviewhistoryitem_webkit.h
new file mode 100644 (file)
index 0000000..97a23d2
--- /dev/null
+++ b/include/wx/osx/webviewhistoryitem_webkit.h
@@ -0,0 +1,35 @@
+/////////////////////////////////////////////////////////////////////////////
+// Name:        include/wx/osx/webviewhistoryitem.h
+// Purpose:     wxWebViewHistoryItem header for OSX
+// Author:      Steven Lamerton
+// Id:          $Id$
+// Copyright:   (c) 2011 Steven Lamerton
+// Licence:     wxWindows licence
+/////////////////////////////////////////////////////////////////////////////
+
+#ifndef _WX_OSX_WEBVIEWHISTORYITEM_H_
+#define _WX_OSX_WEBVIEWHISTORYITEM_H_
+
+#include "wx/setup.h"
+
+#if wxUSE_WEBVIEW_WEBKIT && (defined(__WXOSX_COCOA__) \
+                         ||  defined(__WXOSX_CARBON__))
+
+class WXDLLIMPEXP_WEB wxWebViewHistoryItem
+{
+public:
+    wxWebViewHistoryItem(const wxString& url, const wxString& title) :
+                     m_url(url), m_title(title) {}
+    wxString GetUrl() { return m_url; }
+    wxString GetTitle() { return m_title; }
+
+    friend class wxWebViewWebKit;
+
+private:
+    wxString m_url, m_title;
+    struct objc_object *m_histItem;
+};
+
+#endif // wxUSE_WEBVIEW_WEBKIT && defined(__WXOSX_MAC__)
+
+#endif // _WX_OSX_WEBVIEWHISTORYITEM_H_

diff --git a/include/wx/webview.h b/include/wx/webview.h
index 8830059269d1c9e95488a8933943b1e475cf5af7..ec1a1f383f9cb0cad5df7b358765e5c2c1b439e5 100644 (file)
--- a/include/wx/webview.h
+++ b/include/wx/webview.h
@@ -20,9 +20,9 @@
 #include "wx/sharedptr.h"
 #include "wx/vector.h"
 
 #include "wx/sharedptr.h"
 #include "wx/vector.h"
 

-#include "wx/osx/webhistoryitem_webkit.h"
-#include "wx/gtk/webhistoryitem_webkit.h"
-#include "wx/msw/webhistoryitem_ie.h"
+#include "wx/osx/webviewhistoryitem_webkit.h"
+#include "wx/gtk/webviewhistoryitem_webkit.h"
+#include "wx/msw/webviewhistoryitem_ie.h"

 
 class wxFSFile;
 class wxFileSystem;
 
 class wxFSFile;
 class wxFileSystem;


@@ -193,9 +193,9 @@ public:
 
     virtual void ClearHistory() = 0;
     virtual void EnableHistory(bool enable = true) = 0;
 
     virtual void ClearHistory() = 0;
     virtual void EnableHistory(bool enable = true) = 0;

-    virtual wxVector<wxSharedPtr<wxWebHistoryItem> > GetBackwardHistory() = 0;
-    virtual wxVector<wxSharedPtr<wxWebHistoryItem> > GetForwardHistory() = 0;
-    virtual void LoadHistoryItem(wxSharedPtr<wxWebHistoryItem> item) = 0;
+    virtual wxVector<wxSharedPtr<wxWebViewHistoryItem> > GetBackwardHistory() = 0;
+    virtual wxVector<wxSharedPtr<wxWebViewHistoryItem> > GetForwardHistory() = 0;
+    virtual void LoadHistoryItem(wxSharedPtr<wxWebViewHistoryItem> item) = 0;

 
     /**
      * Stop the current page loading process, if any.
 
     /**
      * Stop the current page loading process, if any.

diff --git a/interface/wx/webview.h b/interface/wx/webview.h
index 481317d3e2f81f3175d0a1722cddd619ef6ec4fe..47f7abadb0fbee526e8e0a4798419146bfbac6cc 100644 (file)
--- a/interface/wx/webview.h
+++ b/interface/wx/webview.h
@@ -87,7 +87,7 @@ enum wxWebViewBackend
 };
 
 /**
 };
 
 /**

-    @class wxWebHistoryItem
+    @class wxWebViewHistoryItem

   
     A simple class that contains the URL and title of an element of the history
     of a wxWebView. 
   
     A simple class that contains the URL and title of an element of the history
     of a wxWebView. 


@@ -97,13 +97,13 @@ enum wxWebViewBackend
     
     @see wxWebView
  */
     
     @see wxWebView
  */

-class wxWebHistoryItem
+class wxWebViewHistoryItem

 {
 public:
     /**
         Construtor.
     */
 {
 public:
     /**
         Construtor.
     */

-    wxWebHistoryItem(const wxString& url, const wxString& title);
+    wxWebViewHistoryItem(const wxString& url, const wxString& title);

     
     /**
         @return The url of the page.
     
     /**
         @return The url of the page.


@@ -456,14 +456,14 @@ public:
         Returns a list of items in the back history. The first item in the
         vector is the first page that was loaded by the control.
     */
         Returns a list of items in the back history. The first item in the
         vector is the first page that was loaded by the control.
     */

-    virtual wxVector<wxSharedPtr<wxWebHistoryItem> > GetBackwardHistory() = 0;
+    virtual wxVector<wxSharedPtr<wxWebViewHistoryItem> > GetBackwardHistory() = 0;

 
     /**
         Returns a list of items in the forward history. The first item in the 
         vector is the next item in the history with respect to the curently 
         loaded page.
     */
 
     /**
         Returns a list of items in the forward history. The first item in the 
         vector is the next item in the history with respect to the curently 
         loaded page.
     */

-    virtual wxVector<wxSharedPtr<wxWebHistoryItem> > GetForwardHistory() = 0;
+    virtual wxVector<wxSharedPtr<wxWebViewHistoryItem> > GetForwardHistory() = 0;

 
     /** 
         Navigate back in the history of visited pages.
 
     /** 
         Navigate back in the history of visited pages.


@@ -480,7 +480,7 @@ public:
     /**
         Loads a history item. 
     */
     /**
         Loads a history item. 
     */

-    virtual void LoadHistoryItem(wxSharedPtr<wxWebHistoryItem> item) = 0;
+    virtual void LoadHistoryItem(wxSharedPtr<wxWebViewHistoryItem> item) = 0;

     
     /**
         @name Selection
     
     /**
         @name Selection

diff --git a/samples/web/web.cpp b/samples/web/web.cpp
index f7ae5e31380b4b86b3173ef6310cd87763e8745e..6bf04ffb8af92b0c44f1ecb979801cbc7c49715d 100644 (file)
--- a/samples/web/web.cpp
+++ b/samples/web/web.cpp
@@ -50,7 +50,7 @@
 
 
 //We map menu items to their history items
 
 
 //We map menu items to their history items

-WX_DECLARE_HASH_MAP(int, wxSharedPtr<wxWebHistoryItem>,
+WX_DECLARE_HASH_MAP(int, wxSharedPtr<wxWebViewHistoryItem>,

                     wxIntegerHash, wxIntegerEqual, wxMenuHistoryMap);
 
 class WebApp : public wxApp
                     wxIntegerHash, wxIntegerEqual, wxMenuHistoryMap);
 
 class WebApp : public wxApp


@@ -629,8 +629,8 @@ void WebFrame::OnToolsClicked(wxCommandEvent& WXUNUSED(evt))
     }
     m_histMenuItems.clear();
 
     }
     m_histMenuItems.clear();
 

-    wxVector<wxSharedPtr<wxWebHistoryItem> > back = m_browser->GetBackwardHistory();
-    wxVector<wxSharedPtr<wxWebHistoryItem> > forward = m_browser->GetForwardHistory();
+    wxVector<wxSharedPtr<wxWebViewHistoryItem> > back = m_browser->GetBackwardHistory();
+    wxVector<wxSharedPtr<wxWebViewHistoryItem> > forward = m_browser->GetForwardHistory();

 
     wxMenuItem* item;
 
 
     wxMenuItem* item;
 


@@ -646,7 +646,7 @@ void WebFrame::OnToolsClicked(wxCommandEvent& WXUNUSED(evt))
     item->Check();
 
     //No need to connect the current item
     item->Check();
 
     //No need to connect the current item

-    m_histMenuItems[item->GetId()] = wxSharedPtr<wxWebHistoryItem>(new wxWebHistoryItem(m_browser->GetCurrentURL(), m_browser->GetCurrentTitle()));
+    m_histMenuItems[item->GetId()] = wxSharedPtr<wxWebViewHistoryItem>(new wxWebViewHistoryItem(m_browser->GetCurrentURL(), m_browser->GetCurrentTitle()));

 
     for(unsigned int i = 0; i < forward.size(); i++)
     {
 
     for(unsigned int i = 0; i < forward.size(); i++)
     {

diff --git a/src/gtk/webview_webkit.cpp b/src/gtk/webview_webkit.cpp
index 5a95f5f1943575a0d12afc0f36583d1869a553c6..6a47d8ddcdba8665e3f3a57926ad433b63ba9af6 100644 (file)
--- a/src/gtk/webview_webkit.cpp
+++ b/src/gtk/webview_webkit.cpp
@@ -546,9 +546,9 @@ void wxWebViewWebKit::EnableHistory(bool enable)
     }
 }
 
     }
 }
 

-wxVector<wxSharedPtr<wxWebHistoryItem> > wxWebViewWebKit::GetBackwardHistory()
+wxVector<wxSharedPtr<wxWebViewHistoryItem> > wxWebViewWebKit::GetBackwardHistory()

 {
 {

-    wxVector<wxSharedPtr<wxWebHistoryItem> > backhist; 
+    wxVector<wxSharedPtr<wxWebViewHistoryItem> > backhist; 

     WebKitWebBackForwardList* history;
     history = webkit_web_view_get_back_forward_list(WEBKIT_WEB_VIEW(web_view));
     GList* list = webkit_web_back_forward_list_get_back_list_with_limit(history, 
     WebKitWebBackForwardList* history;
     history = webkit_web_view_get_back_forward_list(WEBKIT_WEB_VIEW(web_view));
     GList* list = webkit_web_back_forward_list_get_back_list_with_limit(history, 


@@ -557,19 +557,19 @@ 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);

-        wxWebHistoryItem* wxitem = new wxWebHistoryItem(
+        wxWebViewHistoryItem* wxitem = new wxWebViewHistoryItem(

                                    webkit_web_history_item_get_uri(gtkitem),
                                    webkit_web_history_item_get_title(gtkitem));
         wxitem->m_histItem = gtkitem;
                                    webkit_web_history_item_get_uri(gtkitem),
                                    webkit_web_history_item_get_title(gtkitem));
         wxitem->m_histItem = gtkitem;

-        wxSharedPtr<wxWebHistoryItem> item(wxitem);
+        wxSharedPtr<wxWebViewHistoryItem> item(wxitem);

         backhist.push_back(item);
     }
     return backhist;
 }
 
         backhist.push_back(item);
     }
     return backhist;
 }
 

-wxVector<wxSharedPtr<wxWebHistoryItem> > wxWebViewWebKit::GetForwardHistory()
+wxVector<wxSharedPtr<wxWebViewHistoryItem> > wxWebViewWebKit::GetForwardHistory()

 {
 {

-    wxVector<wxSharedPtr<wxWebHistoryItem> > forwardhist; 
+    wxVector<wxSharedPtr<wxWebViewHistoryItem> > forwardhist; 

     WebKitWebBackForwardList* history;
     history = webkit_web_view_get_back_forward_list(WEBKIT_WEB_VIEW(web_view));
     GList* list = webkit_web_back_forward_list_get_forward_list_with_limit(history, 
     WebKitWebBackForwardList* history;
     history = webkit_web_view_get_back_forward_list(WEBKIT_WEB_VIEW(web_view));
     GList* list = webkit_web_back_forward_list_get_forward_list_with_limit(history, 


@@ -577,17 +577,17 @@ 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);

-        wxWebHistoryItem* wxitem = new wxWebHistoryItem(
+        wxWebViewHistoryItem* wxitem = new wxWebViewHistoryItem(

                                    webkit_web_history_item_get_uri(gtkitem),
                                    webkit_web_history_item_get_title(gtkitem));
         wxitem->m_histItem = gtkitem;
                                    webkit_web_history_item_get_uri(gtkitem),
                                    webkit_web_history_item_get_title(gtkitem));
         wxitem->m_histItem = gtkitem;

-        wxSharedPtr<wxWebHistoryItem> item(wxitem);
+        wxSharedPtr<wxWebViewHistoryItem> item(wxitem);

         forwardhist.push_back(item);
     }
     return forwardhist;
 }
 
         forwardhist.push_back(item);
     }
     return forwardhist;
 }
 

-void wxWebViewWebKit::LoadHistoryItem(wxSharedPtr<wxWebHistoryItem> item)
+void wxWebViewWebKit::LoadHistoryItem(wxSharedPtr<wxWebViewHistoryItem> item)

 {
     WebKitWebHistoryItem* gtkitem = item->m_histItem;
     if(gtkitem)
 {
     WebKitWebHistoryItem* gtkitem = item->m_histItem;
     if(gtkitem)

diff --git a/src/msw/webview_ie.cpp b/src/msw/webview_ie.cpp
index a90cdc3b1e022a22db81e12e21c33eb6348c2f6d..5d46b479168687e8969c89991b95916964a745f4 100644 (file)
--- a/src/msw/webview_ie.cpp
+++ b/src/msw/webview_ie.cpp
@@ -325,7 +325,7 @@ bool wxWebViewIE::CanGoForward()
         return false;
 }
 
         return false;
 }
 

-void wxWebViewIE::LoadHistoryItem(wxSharedPtr<wxWebHistoryItem> item)
+void wxWebViewIE::LoadHistoryItem(wxSharedPtr<wxWebViewHistoryItem> item)

 {
     int pos = -1;
     for(unsigned int i = 0; i < m_historyList.size(); i++)
 {
     int pos = -1;
     for(unsigned int i = 0; i < m_historyList.size(); i++)


@@ -341,9 +341,9 @@ void wxWebViewIE::LoadHistoryItem(wxSharedPtr<wxWebHistoryItem> item)
     m_historyPosition = pos;
 }
 
     m_historyPosition = pos;
 }
 

-wxVector<wxSharedPtr<wxWebHistoryItem> > wxWebViewIE::GetBackwardHistory()
+wxVector<wxSharedPtr<wxWebViewHistoryItem> > wxWebViewIE::GetBackwardHistory()

 {
 {

-    wxVector<wxSharedPtr<wxWebHistoryItem> > backhist;
+    wxVector<wxSharedPtr<wxWebViewHistoryItem> > backhist;

     //As we don't have std::copy or an iterator constructor in the wxwidgets
     //native vector we construct it by hand
     for(int i = 0; i < m_historyPosition; i++)
     //As we don't have std::copy or an iterator constructor in the wxwidgets
     //native vector we construct it by hand
     for(int i = 0; i < m_historyPosition; i++)


@@ -353,9 +353,9 @@ wxVector<wxSharedPtr<wxWebHistoryItem> > wxWebViewIE::GetBackwardHistory()
     return backhist;
 }
 
     return backhist;
 }
 

-wxVector<wxSharedPtr<wxWebHistoryItem> > wxWebViewIE::GetForwardHistory()
+wxVector<wxSharedPtr<wxWebViewHistoryItem> > wxWebViewIE::GetForwardHistory()

 {
 {

-    wxVector<wxSharedPtr<wxWebHistoryItem> > forwardhist;
+    wxVector<wxSharedPtr<wxWebViewHistoryItem> > forwardhist;

     //As we don't have std::copy or an iterator constructor in the wxwidgets
     //native vector we construct it by hand
     for(int i = m_historyPosition + 1; i < static_cast<int>(m_historyList.size()); i++)
     //As we don't have std::copy or an iterator constructor in the wxwidgets
     //native vector we construct it by hand
     for(int i = m_historyPosition + 1; i < static_cast<int>(m_historyList.size()); i++)


@@ -789,7 +789,7 @@ void wxWebViewIE::onActiveXEvent(wxActiveXEvent& evt)
                     m_historyList.erase(m_historyList.begin() + m_historyPosition + 1,
                                         m_historyList.end());
                 }
                     m_historyList.erase(m_historyList.begin() + m_historyPosition + 1,
                                         m_historyList.end());
                 }

-                wxSharedPtr<wxWebHistoryItem> item(new wxWebHistoryItem(url, GetCurrentTitle()));
+                wxSharedPtr<wxWebViewHistoryItem> item(new wxWebViewHistoryItem(url, GetCurrentTitle()));

                 m_historyList.push_back(item);
                 m_historyPosition++;
             }
                 m_historyList.push_back(item);
                 m_historyPosition++;
             }

diff --git a/src/osx/webview_webkit.mm b/src/osx/webview_webkit.mm
index 2cf09e46686cf0fe64d15ea160c66b5f6332688a..ad3f20eeab514f69569cff06094e1d126b2fa93a 100644 (file)
--- a/src/osx/webview_webkit.mm
+++ b/src/osx/webview_webkit.mm
@@ -921,9 +921,9 @@ void wxWebViewWebKit::ClearHistory()
     [m_webView setMaintainsBackForwardList:YES];
 }
 
     [m_webView setMaintainsBackForwardList:YES];
 }
 

-wxVector<wxSharedPtr<wxWebHistoryItem> > wxWebViewWebKit::GetBackwardHistory()
+wxVector<wxSharedPtr<wxWebViewHistoryItem> > wxWebViewWebKit::GetBackwardHistory()

 {
 {

-    wxVector<wxSharedPtr<wxWebHistoryItem> > backhist;
+    wxVector<wxSharedPtr<wxWebViewHistoryItem> > backhist;

     WebBackForwardList* history = [m_webView backForwardList];
     int count = [history backListCount];
     for(int i = -count; i < 0; i++)
     WebBackForwardList* history = [m_webView backForwardList];
     int count = [history backListCount];
     for(int i = -count; i < 0; i++)


@@ -931,17 +931,17 @@ wxVector<wxSharedPtr<wxWebHistoryItem> > wxWebViewWebKit::GetBackwardHistory()
         WebHistoryItem* item = [history itemAtIndex:i];
         wxString url = wxStringWithNSString([item URLString]);
         wxString title = wxStringWithNSString([item title]);
         WebHistoryItem* item = [history itemAtIndex:i];
         wxString url = wxStringWithNSString([item URLString]);
         wxString title = wxStringWithNSString([item title]);

-        wxWebHistoryItem* wxitem = new wxWebHistoryItem(url, title);
+        wxWebViewHistoryItem* wxitem = new wxWebViewHistoryItem(url, title);

         wxitem->m_histItem = item;
         wxitem->m_histItem = item;

-        wxSharedPtr<wxWebHistoryItem> itemptr(wxitem);
+        wxSharedPtr<wxWebViewHistoryItem> itemptr(wxitem);

         backhist.push_back(itemptr);
     }
     return backhist;
 }
 
         backhist.push_back(itemptr);
     }
     return backhist;
 }
 

-wxVector<wxSharedPtr<wxWebHistoryItem> > wxWebViewWebKit::GetForwardHistory()
+wxVector<wxSharedPtr<wxWebViewHistoryItem> > wxWebViewWebKit::GetForwardHistory()

 {
 {

-    wxVector<wxSharedPtr<wxWebHistoryItem> > forwardhist;
+    wxVector<wxSharedPtr<wxWebViewHistoryItem> > forwardhist;

     WebBackForwardList* history = [m_webView backForwardList];
     int count = [history forwardListCount];
     for(int i = 1; i <= count; i++)
     WebBackForwardList* history = [m_webView backForwardList];
     int count = [history forwardListCount];
     for(int i = 1; i <= count; i++)


@@ -949,15 +949,15 @@ wxVector<wxSharedPtr<wxWebHistoryItem> > wxWebViewWebKit::GetForwardHistory()
         WebHistoryItem* item = [history itemAtIndex:i];
         wxString url = wxStringWithNSString([item URLString]);
         wxString title = wxStringWithNSString([item title]);
         WebHistoryItem* item = [history itemAtIndex:i];
         wxString url = wxStringWithNSString([item URLString]);
         wxString title = wxStringWithNSString([item title]);

-        wxWebHistoryItem* wxitem = new wxWebHistoryItem(url, title);
+        wxWebViewHistoryItem* wxitem = new wxWebViewHistoryItem(url, title);

         wxitem->m_histItem = item;
         wxitem->m_histItem = item;

-        wxSharedPtr<wxWebHistoryItem> itemptr(wxitem);
+        wxSharedPtr<wxWebViewHistoryItem> itemptr(wxitem);

         forwardhist.push_back(itemptr);
     }
     return forwardhist;
 }
 
         forwardhist.push_back(itemptr);
     }
     return forwardhist;
 }
 

-void wxWebViewWebKit::LoadHistoryItem(wxSharedPtr<wxWebHistoryItem> item)
+void wxWebViewWebKit::LoadHistoryItem(wxSharedPtr<wxWebViewHistoryItem> item)

 {
     [m_webView goToBackForwardItem:item->m_histItem];
 }
 {
     [m_webView goToBackForwardItem:item->m_histItem];
 }