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

Split wxWebHistoryItem headers out into separate files for each backend. This will allow us to dramatically reduce the amount of code in the GTK history implementation and implement it and OSX history support more cleanly.

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/SOC2011_WEBVIEW@68473 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Steve Lamerton
2011-07-31 14:06:33 +00:00
parent 9b4670e5bc
commit eafdb19c44
5 changed files with 109 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
build/bakefiles/files.bkl
View File

@@ -3361,9 +3361,18 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
</set>
<set var="WEB_HDR_PLATFORM" hints="files">
<if cond="TOOLKIT=='MSW'">wx/msw/webview_ie.h</if>
<if cond="PLATFORM_UNIX=='1'">wx/gtk/webview_webkit.h</if>
<if cond="PLATFORM_MACOSX=='1'">wx/osx/webview_webkit.h</if>
<if cond="TOOLKIT=='MSW'">
wx/msw/webhistoryitem_ie.h
wx/msw/webview_ie.h
</if>
<if cond="PLATFORM_UNIX=='1'">
wx/gtk/webhistoryitem_webkit.h
wx/gtk/webview_webkit.h
</if>
<if cond="PLATFORM_MACOSX=='1'">
wx/osx/webhistoryitem_webkit.h
wx/osx/webview_webkit.h
</if>
</set>
<set var="WEB_HDR" hints="files">
$(WEB_HDR_PLATFORM)

31
include/wx/gtk/webhistoryitem_webkit.h Normal file
View File

@@ -0,0 +1,31 @@
/////////////////////////////////////////////////////////////////////////////
// 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
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_WEBKIT
#endif // _WX_GTK_WEBHISTORYITEM_H_

31
include/wx/msw/webhistoryitem_ie.h Normal file
View File

@@ -0,0 +1,31 @@
/////////////////////////////////////////////////////////////////////////////
// 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
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
#endif // _WX_MSW_WEBHISTORYITEM_H_

31
include/wx/osx/webhistoryitem_webkit.h Normal file
View File

@@ -0,0 +1,31 @@
/////////////////////////////////////////////////////////////////////////////
// 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
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_WEBKIT
#endif // _WX_OSX_WEBHISTORYITEM_H_

15
include/wx/webview.h
View File

@@ -20,20 +20,13 @@
#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"
class wxFSFile;
class wxFileSystem;
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;
};
/**
* Zoom level in web view component