Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Rename wxWebHistoryItem to wxWebViewHistoryItem.

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/SOC2011_WEBVIEW@68698 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Steve Lamerton
2011-08-15 12:31:31 +00:00
parent 04fa04d806
commit c13d6ac1ea
12 changed files with 71 additions and 71 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
include/wx/gtk/webview_webkit.h
View File

@@ -74,9 +74,9 @@ public:
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();

14
include/wx/gtk/webhistoryitem_webkit.h → include/wx/gtk/webviewhistoryitem_webkit.h
View File

@@ -1,14 +1,14 @@
/////////////////////////////////////////////////////////////////////////////
// Name: include/wx/gtk/webhistoryitem.h
// Purpose: wxWebHistoryItem header for GTK
// 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_WEBHISTORYITEM_H_
#define _WX_GTK_WEBHISTORYITEM_H_
#ifndef _WX_GTK_WEBVIEWHISTORYITEM_H_
#define _WX_GTK_WEBVIEWHISTORYITEM_H_
#include "wx/setup.h"
@@ -16,10 +16,10 @@
#include "webkit/webkit.h"
class WXDLLIMPEXP_WEB wxWebHistoryItem
class WXDLLIMPEXP_WEB wxWebViewHistoryItem
{
public:
wxWebHistoryItem(const wxString& url, const wxString& title) :
wxWebViewHistoryItem(const wxString& url, const wxString& title) :
m_url(url), m_title(title) {}
wxString GetUrl() { return m_url; }
wxString GetTitle() { return m_title; }
@@ -33,4 +33,4 @@ private:
#endif // wxUSE_WEBVIEW_WEBKIT && defined(__WXGTK__)
#endif // _WX_GTK_WEBHISTORYITEM_H_
#endif // _WX_GTK_WEBVIEWHISTORYITEM_H_

8
include/wx/msw/webview_ie.h
View File

@@ -50,9 +50,9 @@ public:
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();
@@ -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.
wxVector<wxSharedPtr<wxWebHistoryItem> > m_historyList;
wxVector<wxSharedPtr<wxWebViewHistoryItem> > m_historyList;
int m_historyPosition;
bool m_historyLoadingFromList;
bool m_historyEnabled;

14
include/wx/msw/webhistoryitem_ie.h → include/wx/msw/webviewhistoryitem_ie.h
View File

@@ -1,23 +1,23 @@
/////////////////////////////////////////////////////////////////////////////
// Name: include/wx/msw/webhistoryitem.h
// Purpose: wxWebHistoryItem header for MSW
// 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_WEBHISTORYITEM_H_
#define _WX_MSW_WEBHISTORYITEM_H_
#ifndef _WX_MSW_WEBVIEWHISTORYITEM_H_
#define _WX_MSW_WEBVIEWHISTORYITEM_H_
#include "wx/setup.h"
#if wxUSE_WEBVIEW_IE && defined(__WXMSW__)
class WXDLLIMPEXP_WEB wxWebHistoryItem
class WXDLLIMPEXP_WEB wxWebViewHistoryItem
{
public:
wxWebHistoryItem(const wxString& url, const wxString& title) :
wxWebViewHistoryItem(const wxString& url, const wxString& title) :
m_url(url), m_title(title) {}
wxString GetUrl() { return m_url; }
wxString GetTitle() { return m_title; }
@@ -28,4 +28,4 @@ private:
#endif // wxUSE_WEBVIEW_IE && defined(__WXMSW__)
#endif // _WX_MSW_WEBHISTORYITEM_H_
#endif // _WX_MSW_WEBVIEWHISTORYITEM_H_

6
include/wx/osx/webview_webkit.h
View File

@@ -81,9 +81,9 @@ public:
//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();

14
include/wx/osx/webhistoryitem_webkit.h → include/wx/osx/webviewhistoryitem_webkit.h
View File

@@ -1,24 +1,24 @@
/////////////////////////////////////////////////////////////////////////////
// Name: include/wx/osx/webhistoryitem.h
// Purpose: wxWebHistoryItem header for OSX
// 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_WEBHISTORYITEM_H_
#define _WX_OSX_WEBHISTORYITEM_H_
#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 wxWebHistoryItem
class WXDLLIMPEXP_WEB wxWebViewHistoryItem
{
public:
wxWebHistoryItem(const wxString& url, const wxString& title) :
wxWebViewHistoryItem(const wxString& url, const wxString& title) :
m_url(url), m_title(title) {}
wxString GetUrl() { return m_url; }
wxString GetTitle() { return m_title; }
@@ -32,4 +32,4 @@ private:
#endif // wxUSE_WEBVIEW_WEBKIT && defined(__WXOSX_MAC__)
#endif // _WX_OSX_WEBHISTORYITEM_H_
#endif // _WX_OSX_WEBVIEWHISTORYITEM_H_

12
include/wx/webview.h
View File

@@ -20,9 +20,9 @@
#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;
@@ -193,9 +193,9 @@ public:
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.